sonamu 0.7.4 → 0.7.6

package/src/template/implementations/view_form.template.ts

@@ -35,13 +35,13 @@ export class Template__view_form extends Template {
     if (col.renderType === "enums") {
       const { id, targetEntityNames } = getEnumInfoFromColName(entityId, col.name);
       const componentId = `${id}Select`;
-      return `import { ${componentId} } from "src/components/${targetEntityNames.fs}/${componentId}";`;
+      return `import { ${componentId} } from "@/components/${targetEntityNames.fs}/${componentId}";`;
     } else if (col.renderType === "number-fk_id") {
       try {
         const relProp = getRelationPropFromColName(entityId, col.name.replace("_id", ""));
         const targetNames = EntityManager.getNamesFromId(relProp.with);
         const componentId = `${relProp.with}IdAsyncSelect`;
-        return `import { ${componentId} } from "src/components/${targetNames.fs}/${componentId}";`;
+        return `import { ${componentId} } from "@/components/${targetNames.fs}/${componentId}";`;
       } catch {
         return "";
       }
@@ -111,6 +111,9 @@ export class Template__view_form extends Template {
         return `<>${col.name} array</>`;
       case "object":
         return `<>${col.name} object</>`;
+      case "vector":
+        // vector 타입은 일반적으로 API를 통해 생성되므로 읽기 전용으로 표시
+        return `<div className="p-8px text-gray-500">[Vector: ${col.name}] - 임베딩 데이터는 API를 통해 자동 생성됩니다.</div>`;
       default:
         throw new Error(`대응 불가능한 렌더 타입 ${col.renderType} on ${col.name}`);
     }
@@ -248,13 +251,13 @@ import {
 import { DateTime } from "luxon";
 
 import { BackLink, LinkInput, NumberInput, BooleanToggle, SQLDateTimeInput, SQLDateInput, useTypeForm, useGoBack, formatDateTime } from "@sonamu-kit/react-sui";
-import { defaultCatch } from 'src/services/sonamu.shared';
-// import { ImageUploader } from 'src/admin-common/ImageUploader';
-// import { useCommonModal } from "src/admin-common/CommonModal";
+import { defaultCatch } from '@/services/sonamu.shared';
+// import { ImageUploader } from '@/admin-common/ImageUploader';
+// import { useCommonModal } from "@/admin-common/CommonModal";
 
-import { ${names.capital}SaveParams } from 'src/services/${names.fs}/${names.fs}.types';
-import { ${names.capital}Service } from 'src/services/${names.fs}/${names.fs}.service';
-import { ${names.capital}SubsetA } from 'src/services/sonamu.generated';
+import { ${names.capital}SaveParams } from '@/services/${names.fs}/${names.fs}.types';
+import { ${names.capital}Service } from '@/services/${names.fs}/${names.fs}.service';
+import { ${names.capital}SubsetA } from '@/services/sonamu.generated';
 ${unique(
   columns
     .filter((col) => ["number-fk_id", "enums"].includes(col.renderType))

package/src/template/implementations/view_id_async_select.template.ts

@@ -39,9 +39,9 @@ import React, { useState, useEffect, SyntheticEvent } from "react";
 import { DropdownProps, DropdownItemProps, DropdownOnSearchChangeData, Dropdown } from "semantic-ui-react";
 import { ${names.capital}SubsetKey, ${
         names.capital
-      }SubsetMapping } from "src/services/sonamu.generated";
-import { ${names.capital}Service } from "src/services/${names.fs}/${names.fs}.service";
-import { ${names.capital}ListParams } from "src/services/${names.fs}/${names.fs}.types";
+      }SubsetMapping } from "@/services/sonamu.generated";
+import { ${names.capital}Service } from "@/services/${names.fs}/${names.fs}.service";
+import { ${names.capital}ListParams } from "@/services/${names.fs}/${names.fs}.types";
 
 export function ${names.capital}IdAsyncSelect<T extends ${names.capital}SubsetKey>(
   { subset, baseListParams, textField, valueField, ...props }: DropdownProps & {

package/src/template/implementations/view_list.template.ts

@@ -86,6 +86,9 @@ export class Template__view_list extends Template {
       }
       case "array":
         return `<>{ /* array ${colName} */ }</>`;
+      case "vector":
+        // vector 타입은 차원 수만 표시 (실제 데이터는 너무 김)
+        return `<>{${col.nullable ? `${colName} ? ` : ""}[Vector: {${colName}${col.nullable ? "" : " ?? []"}.length}d]${col.nullable ? " : '-'" : ""}}</>`;
       default:
         throw new Error(`렌더 불가 컬럼 ${col.renderType}`);
     }
@@ -98,7 +101,7 @@ export class Template__view_list extends Template {
   ): (string | null)[] {
     if (col.renderType === "enums") {
       const { id: enumId } = getEnumInfoFromColName(names.capital, col.name);
-      return [`import { ${enumId}Label } from 'src/services/sonamu.generated';`];
+      return [`import { ${enumId}Label } from '@/services/sonamu.generated';`];
     } else if (col.renderType === "object") {
       try {
         const relProp = getRelationPropFromColName(entityId, col.name);
@@ -121,11 +124,11 @@ export class Template__view_list extends Template {
 
   renderFilterImport(entityId: string, col: RenderingNode, names: EntityNamesRecord) {
     if (col.name === "search") {
-      return `import { ${names.capital}SearchInput } from "src/components/${names.fs}/${names.capital}SearchInput";`;
+      return `import { ${names.capital}SearchInput } from "@/components/${names.fs}/${names.capital}SearchInput";`;
     } else if (col.renderType === "enums") {
       if (col.name === "orderBy") {
         const componentId = `${names.capital}${inflection.camelize(col.name)}Select`;
-        return `import { ${componentId} } from "src/components/${names.fs}/${componentId}";`;
+        return `import { ${componentId} } from "@/components/${names.fs}/${componentId}";`;
       } else {
         try {
           const { id, targetEntityNames: targetMDNames } = getEnumInfoFromColName(
@@ -133,7 +136,7 @@ export class Template__view_list extends Template {
             col.name,
           );
           const componentId = `${id}Select`;
-          return `import { ${componentId} } from "src/components/${targetMDNames.fs}/${componentId}";`;
+          return `import { ${componentId} } from "@/components/${targetMDNames.fs}/${componentId}";`;
         } catch {
           return "";
         }
@@ -143,7 +146,7 @@ export class Template__view_list extends Template {
         const relProp = getRelationPropFromColName(entityId, col.name.replace("_id", ""));
         const targetNames = EntityManager.getNamesFromId(relProp.with);
         const componentId = `${relProp.with}IdAsyncSelect`;
-        return `import { ${componentId} } from "src/components/${targetNames.fs}/${componentId}";`;
+        return `import { ${componentId} } from "@/components/${targetNames.fs}/${componentId}";`;
       } catch {
         return "";
       }
@@ -322,9 +325,9 @@ import classNames from 'classnames';
 import { DateTime } from "luxon";
 import { DelButton, EditButton, AppBreadcrumbs, AddButton, useSelection, useListParams, SonamuCol, numF, formatDate, formatDateTime } from '@sonamu-kit/react-sui';
 
-import { ${names.capital}SubsetA } from "src/services/sonamu.generated";
-import { ${names.capital}Service } from 'src/services/${names.fs}/${names.fs}.service';
-import { ${names.capital}ListParams } from 'src/services/${names.fs}/${names.fs}.types';
+import { ${names.capital}SubsetA } from "@/services/sonamu.generated";
+import { ${names.capital}Service } from '@/services/${names.fs}/${names.fs}.service';
+import { ${names.capital}ListParams } from '@/services/${names.fs}/${names.fs}.types';
 ${columnImports}
 ${filterColumns
   .map((col) => {

package/src/template/implementations/view_search_input.template.ts

@@ -23,7 +23,7 @@ export class Template__view_search_input extends Template {
 import React from "react";
 import { useState } from "react";
 import { DropdownProps, Input, InputProps } from "semantic-ui-react";
-import { ${names.capital}SearchFieldDropdown } from "src/components/${names.fs}/${names.capital}SearchFieldDropdown";
+import { ${names.capital}SearchFieldDropdown } from "@/components/${names.fs}/${names.capital}SearchFieldDropdown";
 
 export function ${names.capital}SearchInput({
   input: { value: inputValue, onChange: inputOnChange, ...inputProps },

package/src/template/template.ts

@@ -70,7 +70,7 @@ export abstract class Template {
     const instance = Template.templates.get(key);
     if (!instance) {
       throw new Error(
-        `Template ${key} not found. It might be becasuse you tried to find a template before loading all templates. Did you call Template.loadAll()?`,
+        `Template ${key} not found. It might be because you tried to find a template before loading all templates. Did you call Template.loadAll()?`,
       );
     }
     return instance;

package/src/template/zod-converter.ts

@@ -49,6 +49,8 @@ import {
   isStringSingleProp,
   isUuidArrayProp,
   isUuidSingleProp,
+  isVectorArrayProp,
+  isVectorSingleProp,
   isVirtualProp,
   type RenderingNode,
 } from "../types/types";
@@ -131,6 +133,10 @@ export async function propToZodType(prop: EntityProp): Promise<z.ZodTypeAny> {
     zodType = z.uuid().array();
   } else if (isJsonProp(prop)) {
     zodType = await getZodTypeById(prop.id);
+  } else if (isVectorSingleProp(prop)) {
+    zodType = z.array(z.number());
+  } else if (isVectorArrayProp(prop)) {
+    zodType = z.array(z.array(z.number()));
   } else if (isVirtualProp(prop)) {
     zodType = await getZodTypeById(prop.id);
   } else if (isRelationProp(prop)) {
@@ -205,6 +211,10 @@ export function propToZodTypeDef(prop: EntityProp, injectImportKeys: string[]):
   } else if (isJsonProp(prop)) {
     stmt = `${prop.name}: ${prop.id}`;
     injectImportKeys.push(prop.id);
+  } else if (isVectorSingleProp(prop)) {
+    stmt = `${prop.name}: z.array(z.number())`;
+  } else if (isVectorArrayProp(prop)) {
+    stmt = `${prop.name}: z.array(z.array(z.number()))`;
   } else if (isVirtualProp(prop)) {
     stmt = `${prop.name}: ${prop.id}`;
     injectImportKeys.push(prop.id);
@@ -506,6 +516,16 @@ export function zodTypeToRenderingNode(
         renderType: "array-images",
       };
     }
+    // vector 타입 판별: number 배열이면서 embedding, vector 등의 이름을 가진 경우
+    if (
+      innerType instanceof z.ZodNumber &&
+      (baseKey.includes("embedding") || baseKey.includes("vector"))
+    ) {
+      return {
+        ...def,
+        renderType: "vector",
+      };
+    }
     return {
       ...def,
       renderType: "array",

package/src/testing/fixture-manager.ts

@@ -13,6 +13,7 @@ import { type UBRef, UpsertBuilder } from "../database/upsert-builder";
 import type { Entity } from "../entity/entity";
 import { EntityManager } from "../entity/entity-manager";
 import {
+  type DatabaseSchemaExtend,
   type EntityProp,
   type FixtureImportResult,
   type FixtureRecord,
@@ -95,47 +96,45 @@ export class FixtureManagerClass {
   }
 
   /**
-    이제 FixtureManager.sync() 는 checksum 비교 없이 create database template 으로 수행합니다.
+    원격 fixture DB를 로컬 test DB로 복사합니다.
+    pg_dump로 원격 DB를 덤프하고, pg_restore로 로컬에 복원합니다.
   */
   async sync() {
     const fixtureConn = Sonamu.dbConfig.fixture_remote.connection as Knex.PgConnectionConfig;
     const testConn = Sonamu.dbConfig.test.connection as Knex.PgConnectionConfig;
 
-    // PostgreSQL 패스워드 환경변수 설정
-    const pgEnv = { PGPASSWORD: testConn.password || "" };
-
-    // 1. 연결 강제 종료
+    // 1. 로컬 test DB 연결 종료 및 재생성
+    const testPgEnv = { PGPASSWORD: testConn.password || "" };
     execSync(
       `psql -h ${testConn.host} -p ${testConn.port ?? 5432} -U ${testConn.user} -d postgres -c "
-      SELECT pg_terminate_backend(pg_stat_activity.pid)
-      FROM pg_stat_activity
-      WHERE datname = '${testConn.database}'
-        AND pid <> pg_backend_pid();
-    "`,
-      { stdio: "inherit", env: { ...process.env, ...pgEnv } as NodeJS.ProcessEnv },
-    );
-
-    execSync(
-      `psql -h ${fixtureConn.host} -p ${fixtureConn.port ?? 5432} -U ${fixtureConn.user} -d postgres -c "
         SELECT pg_terminate_backend(pg_stat_activity.pid)
         FROM pg_stat_activity
-        WHERE datname = '${fixtureConn.database}'
+        WHERE datname = '${testConn.database}'
           AND pid <> pg_backend_pid();
       "`,
-      { stdio: "inherit", env: { ...process.env, ...pgEnv } as NodeJS.ProcessEnv },
+      { stdio: "inherit", env: { ...process.env, ...testPgEnv } as NodeJS.ProcessEnv },
     );
 
-    // 2. DROP DATABASE (별도 실행!)
     execSync(
       `psql -h ${testConn.host} -p ${testConn.port ?? 5432} -U ${testConn.user} -d postgres -c "DROP DATABASE IF EXISTS \\"${testConn.database}\\""`,
-      { stdio: "inherit", env: { ...process.env, ...pgEnv } as NodeJS.ProcessEnv },
+      { stdio: "inherit", env: { ...process.env, ...testPgEnv } as NodeJS.ProcessEnv },
     );
 
-    // 3. CREATE DATABASE
     execSync(
-      `psql -h ${testConn.host} -p ${testConn.port ?? 5432} -U ${testConn.user} -d postgres -c "CREATE DATABASE \\"${testConn.database}\\" TEMPLATE \\"${fixtureConn.database}\\""`,
-      { stdio: "inherit", env: { ...process.env, ...pgEnv } as NodeJS.ProcessEnv },
+      `psql -h ${testConn.host} -p ${testConn.port ?? 5432} -U ${testConn.user} -d postgres -c "CREATE DATABASE \\"${testConn.database}\\""`,
+      { stdio: "inherit", env: { ...process.env, ...testPgEnv } as NodeJS.ProcessEnv },
     );
+
+    // 2. 원격 fixture DB → 로컬 test DB로 복사 (pg_dump | pg_restore)
+    const fixturePgEnv = { PGPASSWORD: fixtureConn.password || "" };
+    const dumpCmd = `pg_dump -h ${fixtureConn.host} -p ${fixtureConn.port ?? 5432} -U ${fixtureConn.user} -d ${fixtureConn.database} -Fc`;
+    const restoreCmd = `pg_restore -h ${testConn.host} -p ${testConn.port ?? 5432} -U ${testConn.user} -d ${testConn.database} --no-owner --no-acl`;
+
+    execSync(`${dumpCmd} | PGPASSWORD="${testConn.password || ""}" ${restoreCmd}`, {
+      stdio: "inherit",
+      env: { ...process.env, ...fixturePgEnv } as NodeJS.ProcessEnv,
+      shell: "/bin/bash",
+    });
   }
 
   private visitedRecords = new Set<string>();
@@ -506,7 +505,9 @@ export class FixtureManagerClass {
           // upsert된 row들의 uuid -> id 매핑 구축
           if (uuids.length > 0) {
             const uuidToId = new Map<string, number>();
-            const rows = await trx(tableName).select("uuid", "id").whereIn("uuid", uuids);
+            const rows = await trx(tableName as string)
+              .select("uuid", "id")
+              .whereIn("uuid", uuids);
 
             for (const row of rows) {
               uuidToId.set(row.uuid, row.id);
@@ -656,7 +657,7 @@ export class FixtureManagerClass {
   /**
    * 테이블 순서 추출 (fixtures에 포함된 테이블만)
    */
-  private getTableOrder(fixtures: FixtureRecord[]): string[] {
+  private getTableOrder(fixtures: FixtureRecord[]): (keyof DatabaseSchemaExtend)[] {
     const tables: string[] = [];
     const seen = new Set<string>();
 
@@ -668,7 +669,7 @@ export class FixtureManagerClass {
       }
     }
 
-    return tables;
+    return tables as (keyof DatabaseSchemaExtend)[];
   }
 
   private async processManyToManyRelations(
@@ -755,7 +756,7 @@ export class FixtureManagerClass {
     const _uniqueIndexes = entity.indexes?.filter((i) => i.type === "unique") ?? [];
 
     const uniqueIndexes = _uniqueIndexes.filter((index) =>
-      index.columns.every((column) => !column.startsWith(`${entity.table}__`)),
+      index.columns.every((column) => !column.name.startsWith(`${entity.table}__`)),
     );
     if (uniqueIndexes.length === 0) {
       return null;
@@ -767,7 +768,7 @@ export class FixtureManagerClass {
     for (const index of uniqueIndexes) {
       // 컬럼 중 하나라도 null이면 유니크 제약을 위반하지 않기 때문에 해당 인덱스는 무시
       const containsNull = index.columns.some((column) => {
-        const field = column.replace(/_id$/, "");
+        const field = column.name.replace(/_id$/, "");
         return fixture.columns[field]?.value === null;
       });
       if (containsNull) {
@@ -776,12 +777,12 @@ export class FixtureManagerClass {
 
       uniqueQuery = uniqueQuery.orWhere((qb) => {
         for (const column of index.columns) {
-          const field = column.replace(/_id$/, "");
+          const field = column.name.replace(/_id$/, "");
 
           if (Array.isArray(fixture.columns[field]?.value)) {
-            qb.whereIn(column, fixture.columns[field].value);
+            qb.whereIn(column.name, fixture.columns[field].value);
           } else {
-            qb.andWhere(column, fixture.columns[field]?.value);
+            qb.andWhere(column.name, fixture.columns[field]?.value);
           }
         }
       });