sonamu 0.7.15 → 0.7.17

package/src/template/implementations/services.template.ts

@@ -0,0 +1,226 @@
+import inflection from "inflection";
+import { diff, unique } from "radashi";
+import {
+  apiParamToTsCode,
+  apiParamTypeToTsType,
+  unwrapPromiseOnce,
+} from "../../api/code-converters";
+import type { ExtendedApi } from "../../api/decorators";
+import { Sonamu } from "../../api/sonamu";
+import type { TemplateOptions } from "../../types/types";
+import { ApiParamType } from "../../types/types";
+import { assertDefined } from "../../utils/utils";
+import { Template } from "../template";
+
+export class Template__services extends Template {
+  constructor() {
+    super("services");
+  }
+
+  getTargetAndPath() {
+    return {
+      target: ":target/src/services",
+      path: `services.generated.ts`,
+    };
+  }
+
+  render({}: TemplateOptions["services"]) {
+    const { apis } = Sonamu.syncer;
+
+    // 모델별로 그룹화
+    const apisByModel = new Map<string, ExtendedApi[]>();
+    for (const api of apis) {
+      const modelName = api.modelName.replace(/Model$/, "").replace(/Frame$/, "");
+      if (!apisByModel.has(modelName)) {
+        apisByModel.set(modelName, []);
+      }
+      apisByModel.get(modelName)?.push(api);
+    }
+
+    const importKeys: string[] = [];
+    const namespaces: string[] = [];
+    let typeParamNames: string[] = [];
+
+    for (const [modelName, modelApis] of apisByModel) {
+      const functions: string[] = [];
+
+      for (const api of modelApis) {
+        // Context 제외한 파라미터
+        const paramsWithoutContext = api.parameters.filter(
+          (param) =>
+            !ApiParamType.isContext(param.type) &&
+            !ApiParamType.isRefKnex(param.type) &&
+            !(param.optional === true && param.name.startsWith("_")),
+        );
+
+        // 타입 파라미터 정의
+        const typeParametersAsTsType = api.typeParameters
+          .map((typeParam) => apiParamTypeToTsType(typeParam, importKeys))
+          .join(", ");
+        const typeParamsDef = typeParametersAsTsType ? `<${typeParametersAsTsType}>` : "";
+        typeParamNames = typeParamNames.concat(api.typeParameters.map((tp) => tp.id));
+
+        // 파라미터 정의
+        const paramsDef = apiParamToTsCode(paramsWithoutContext, importKeys);
+        const paramNames = paramsWithoutContext.map((p) => p.name).join(", ");
+
+        // 리턴 타입 정의
+        const returnTypeDef = apiParamTypeToTsType(
+          assertDefined(unwrapPromiseOnce(api.returnType)),
+          importKeys,
+        );
+
+        // 기본 URL
+        const apiBaseUrl = `${Sonamu.config.api.route.prefix}${api.path}`;
+
+        const clients = api.options.clients || [];
+
+        // 1. axios 함수 생성
+        // resourceName이 있으면 get + resourceName 형태로 함수명 생성
+        const methodName = api.options.resourceName
+          ? `get${inflection.camelize(api.options.resourceName)}`
+          : api.methodName;
+
+        // axios-multipart 처리 (파일 업로드)
+        if (clients.includes("axios-multipart")) {
+          const isMultiple = api.uploadOptions?.mode === "multiple";
+          const fileParamName = isMultiple ? "files" : "file";
+          const fileParamType = isMultiple ? "File[]" : "File";
+
+          const formDataAppend = isMultiple
+            ? `${fileParamName}.forEach(f => { formData.append("${fileParamName}", f); });`
+            : `formData.append("${fileParamName}", ${fileParamName});`;
+
+          const otherParamsAppend = paramsWithoutContext
+            .map((param) => `formData.append('${param.name}', String(${param.name}));`)
+            .join("\n    ");
+
+          const paramsDefComma = paramsDef !== "" ? ", " : "";
+          functions.push(
+            `
+export async function ${methodName}${typeParamsDef}(
+  ${paramsDef}${paramsDefComma}
+  ${fileParamName}: ${fileParamType},
+  onUploadProgress?: (pe: AxiosProgressEvent) => void
+): Promise<${returnTypeDef}> {
+  const formData = new FormData();
+  ${formDataAppend}
+  ${otherParamsAppend}
+  return fetch({
+    method: 'POST',
+    url: \`${apiBaseUrl}\`,
+    headers: {
+      "Content-Type": "multipart/form-data",
+    },
+    onUploadProgress,
+    data: formData,
+    ${api.options.timeout ? `signal: AbortSignal.timeout(${api.options.timeout}),` : ""}
+  });
+}
+          `.trim(),
+          );
+        } else if (api.options.httpMethod === "GET") {
+          const hasParams = paramsWithoutContext.length > 0;
+          functions.push(
+            `
+export async function ${methodName}${typeParamsDef}(${paramsDef}): Promise<${returnTypeDef}> {
+  return fetch({
+    method: "GET",
+    url: \`${apiBaseUrl}${hasParams ? `?\${qs.stringify({ ${paramNames} })}` : ""}\`,
+    ${api.options.timeout ? `signal: AbortSignal.timeout(${api.options.timeout}),` : ""}
+  });
+}
+          `.trim(),
+          );
+        } else {
+          const hasParams = paramsWithoutContext.length > 0;
+          functions.push(
+            `
+export async function ${methodName}${typeParamsDef}(${paramsDef}): Promise<${returnTypeDef}> {
+  return fetch({
+    method: "${api.options.httpMethod}",
+    url: \`${apiBaseUrl}\`,
+    ${hasParams ? `data: { ${paramNames} },` : ""}
+    ${api.options.timeout ? `signal: AbortSignal.timeout(${api.options.timeout}),` : ""}
+  });
+}
+          `.trim(),
+          );
+        }
+
+        // 2. queryOptions + useQuery (tanstack-query)
+        if (clients.includes("tanstack-query")) {
+          const hookName = api.options.resourceName
+            ? inflection.camelize(api.options.resourceName, true)
+            : inflection.camelize(api.methodName, true);
+
+          // queryOptions
+          functions.push(
+            `
+export const ${methodName}QueryOptions = ${typeParamsDef}(${paramsDef}) => queryOptions({
+  queryKey: ['${modelName}', '${methodName}'${paramNames ? `, ${paramNames}` : ""}],
+  queryFn: () => ${methodName}(${paramNames})
+});
+          `.trim(),
+          );
+
+          // useQuery hook
+          functions.push(
+            `
+export const use${inflection.camelize(hookName)} = ${typeParamsDef}(${paramsDef}${
+              paramsDef ? ", " : ""
+            }options?: { enabled?: boolean }) =>
+  useQuery({
+    ...${methodName}QueryOptions(${paramNames}),
+    ...options
+  });
+          `.trim(),
+          );
+        }
+
+        // 3. useMutation (tanstack-mutation)
+        if (clients.includes("tanstack-mutation")) {
+          const hookName = inflection.camelize(api.methodName);
+          const mutationParamType =
+            paramsWithoutContext.length > 0
+              ? `{ ${paramsWithoutContext
+                  .map((p) => `${p.name}: ${apiParamTypeToTsType(p.type, [])}`)
+                  .join(", ")} }`
+              : "void";
+          const mutationParamNames =
+            paramsWithoutContext.length > 0
+              ? paramsWithoutContext.map((p) => `params.${p.name}`).join(", ")
+              : "";
+
+          functions.push(
+            `
+export const use${hookName}Mutation = ${typeParamsDef}() => useMutation({
+  mutationFn: (params: ${mutationParamType}) => ${methodName}(${mutationParamNames})
+});
+          `.trim(),
+          );
+        }
+      }
+
+      namespaces.push(
+        `
+export namespace ${modelName}Service {
+${functions.join("\n\n")}
+}
+      `.trim(),
+      );
+    }
+
+    return {
+      ...this.getTargetAndPath(),
+      body: namespaces.join("\n\n"),
+      importKeys: diff(unique(importKeys), [...typeParamNames, "ListResult"]),
+      customHeaders: [
+        `import { queryOptions, useQuery, useMutation } from '@tanstack/react-query';`,
+        `import type { AxiosProgressEvent } from 'axios';`,
+        `import qs from 'qs';`,
+        `import { type ListResult, fetch } from './sonamu.shared';`,
+      ],
+    };
+  }
+}

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

@@ -256,7 +256,7 @@ import { defaultCatch } from '@/services/sonamu.shared';
 // import { useCommonModal } from "@/admin-common/CommonModal";
 
 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}Service } from '@/services/services.generated';
 import { ${names.capital}SubsetA } from '@/services/sonamu.generated';
 ${unique(
   columns

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

@@ -40,7 +40,7 @@ import { DropdownProps, DropdownItemProps, DropdownOnSearchChangeData, Dropdown
 import { ${names.capital}SubsetKey, ${
         names.capital
       }SubsetMapping } from "@/services/sonamu.generated";
-import { ${names.capital}Service } from "@/services/${names.fs}/${names.fs}.service";
+import { ${names.capital}Service } from "@/services/services.generated";
 import { ${names.capital}ListParams } from "@/services/${names.fs}/${names.fs}.types";
 
 export function ${names.capital}IdAsyncSelect<T extends ${names.capital}SubsetKey>(

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

@@ -326,7 +326,7 @@ 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 "@/services/sonamu.generated";
-import { ${names.capital}Service } from '@/services/${names.fs}/${names.fs}.service';
+import { ${names.capital}Service } from '@/services/services.generated';
 import { ${names.capital}ListParams } from '@/services/${names.fs}/${names.fs}.types';
 ${columnImports}
 ${filterColumns
@@ -346,7 +346,7 @@ export default function ${names.capital}List({}: ${names.capital}ListProps) {
   });
 
   // 리스트 쿼리
-  const { data, mutate, error, isLoading } = ${names.capital}Service.use${
+  const { data, refetch, isLoading } = ${names.capital}Service.use${
     names.capitalPlural
   }('A', listParams);
   const { rows, total } = data ?? {};
@@ -359,7 +359,7 @@ export default function ${names.capital}List({}: ${names.capital}ListProps) {
     }
 
     ${names.capital}Service.del(ids).then(() => {
-      mutate();
+      refetch();
     });
   };
 
@@ -371,7 +371,7 @@ export default function ${names.capital}List({}: ${names.capital}ListProps) {
     }
 
     ${names.capital}Service.del(selectedKeys).then(() => {
-      mutate();
+      refetch();
     });
   };
 

package/src/types/types.ts

@@ -104,6 +104,7 @@ export type UuidArrayProp = CommonProp & {
 export type VirtualProp = CommonProp & {
   type: "virtual";
   id: string;
+  virtualType?: "query" | "code"; // default: "code"
 }; // PG: none / TS: any(id) / JSON: any
 export type VectorProp = CommonProp & {
   type: "vector";
@@ -264,6 +265,17 @@ export type EntityIndex = {
    */
   lists?: number;
 };
+
+// SubsetField 타입: string 또는 internal 옵션이 있는 객체
+export type SubsetField = string | { field: string; internal?: boolean };
+
+export function normalizeSubsetField(f: SubsetField): string {
+  return typeof f === "string" ? f : f.field;
+}
+export function isInternalSubsetField(f: SubsetField): boolean {
+  return typeof f !== "string" && f.internal === true;
+}
+
 export type EntityJson = {
   id: string;
   parentId?: string;
@@ -272,7 +284,7 @@ export type EntityJson = {
   props: EntityProp[];
   indexes: EntityIndex[];
   subsets: {
-    [subset: string]: string[];
+    [subset: string]: SubsetField[];
   };
   enums: {
     [enumId: string]: {
@@ -285,6 +297,9 @@ export type EntitySubsetRow = {
   has: {
     [key: string]: boolean;
   };
+  isInternal: {
+    [key: string]: boolean;
+  };
   children: EntitySubsetRow[];
   prefixes: string[];
   relationEntity?: string;
@@ -413,6 +428,14 @@ export function isJsonProp(p: unknown): p is JsonProp {
 export function isVirtualProp(p: unknown): p is VirtualProp {
   return (p as VirtualProp)?.type === "virtual";
 }
+export function isVirtualCodeProp(p: unknown): p is VirtualProp {
+  if (!isVirtualProp(p)) return false;
+  return p.virtualType !== "query"; // undefined도 "code"로 취급
+}
+export function isVirtualQueryProp(p: unknown): p is VirtualProp {
+  if (!isVirtualProp(p)) return false;
+  return p.virtualType === "query";
+}
 export function isVectorSingleProp(p: unknown): p is VectorProp {
   return (p as VectorProp)?.type === "vector";
 }
@@ -951,6 +974,7 @@ const VirtualPropSchema = z
     ...BasePropFields,
     type: z.literal("virtual"),
     id: z.string(),
+    virtualType: z.enum(["query", "code"]).optional(),
   })
   .strict();
 
@@ -1172,7 +1196,12 @@ export const EntityJsonSchema = z
     parentId: z.string().optional().describe("부모 Entity ID"),
     props: z.array(EntityPropSchema),
     indexes: z.array(EntityIndexSchema),
-    subsets: z.record(z.string(), z.array(z.string())),
+    subsets: z.record(
+      z.string(),
+      z.array(
+        z.union([z.string(), z.object({ field: z.string(), internal: z.boolean().optional() })]),
+      ),
+    ),
     enums: z.record(z.string(), z.record(z.string(), z.string())),
   })
   .strict();
@@ -1208,19 +1237,7 @@ export const TemplateOptions = z.object({
   bridge: z.object({
     entityId: z.string(),
   }),
-  service: z.object({
-    namesRecord: z.object({
-      fs: z.string(),
-      fsPlural: z.string(),
-      camel: z.string(),
-      camelPlural: z.string(),
-      capital: z.string(),
-      capitalPlural: z.string(),
-      upper: z.string(),
-      constant: z.string(),
-    }),
-    modelTsPath: z.string(),
-  }),
+  services: z.object({}),
   view_list: z.object({
     entityId: z.string(),
     extra: z.unknown(),
@@ -1273,7 +1290,7 @@ export const TemplateKey = z.enum([
   "model",
   "model_test",
   "bridge",
-  "service",
+  "services",
   "view_list",
   "view_list_columns",
   "view_search_input",

package/src/ui/ai-api.ts

@@ -1,60 +1,61 @@
-// import { convertToModelMessages, type UIMessage } from "ai";
-// import type { FastifyInstance } from "fastify";
-// import { BadRequestException, type FixtureRecord } from "sonamu";
-// import { aiClient } from "./ai-client";
-
-// export async function setAiApi(server: FastifyInstance) {
-//   await aiClient.init();
-
-//   server.post("/api/ai/fixture/chat", async (request, reply) => {
-//     const { messages, fixtureRecords } = request.body as {
-//       messages: UIMessage[];
-//       fixtureRecords?: FixtureRecord[];
-//     };
-
-//     if (!fixtureRecords || fixtureRecords.length === 0) {
-//       throw new BadRequestException("픽스쳐 레코드가 없습니다. 픽스쳐 조회 후 시도하세요.");
-//     }
-
-//     const result = aiClient.handleFixture(convertToModelMessages(messages), fixtureRecords);
-//     const response = result.toUIMessageStreamResponse();
-
-//     reply.raw.writeHead(response.status, Object.fromEntries(response.headers.entries()));
-
-//     if (response.body) {
-//       const reader = response.body.getReader();
-//       while (true) {
-//         const { done, value } = await reader.read();
-//         if (done) break;
-//         reply.raw.write(value);
-//       }
-//     }
-
-//     reply.raw.end();
-//     return reply;
-//   });
-
-//   // Entity/Enum 생성용 AI Chat Stream
-//   server.post("/api/ai/entity/chat", async (request, reply) => {
-//     const { messages } = request.body as {
-//       messages: UIMessage[];
-//     };
-
-//     const result = aiClient.handleEntity(convertToModelMessages(messages));
-//     const response = result.toUIMessageStreamResponse();
-
-//     reply.raw.writeHead(response.status, Object.fromEntries(response.headers.entries()));
-
-//     if (response.body) {
-//       const reader = response.body.getReader();
-//       while (true) {
-//         const { done, value } = await reader.read();
-//         if (done) break;
-//         reply.raw.write(value);
-//       }
-//     }
-
-//     reply.raw.end();
-//     return reply;
-//   });
-// }
+import { convertToModelMessages, type UIMessage } from "ai";
+import type { FastifyInstance } from "fastify";
+import { BadRequestException } from "../exceptions/so-exceptions";
+import type { FixtureRecord } from "../types/types";
+import { aiClient } from "./ai-client";
+
+export async function setAiApi(server: FastifyInstance) {
+  await aiClient.init();
+
+  server.post("/api/ai/fixture/chat", async (request, reply) => {
+    const { messages, fixtureRecords } = request.body as {
+      messages: UIMessage[];
+      fixtureRecords?: FixtureRecord[];
+    };
+
+    if (!fixtureRecords || fixtureRecords.length === 0) {
+      throw new BadRequestException("픽스쳐 레코드가 없습니다. 픽스쳐 조회 후 시도하세요.");
+    }
+
+    const result = aiClient.handleFixture(await convertToModelMessages(messages), fixtureRecords);
+    const response = result.toUIMessageStreamResponse();
+
+    reply.raw.writeHead(response.status, Object.fromEntries(Object.entries(response.headers)));
+
+    if (response.body) {
+      const reader = response.body.getReader();
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        reply.raw.write(value);
+      }
+    }
+
+    reply.raw.end();
+    return reply;
+  });
+
+  // Entity/Enum 생성용 AI Chat Stream
+  server.post("/api/ai/entity/chat", async (request, reply) => {
+    const { messages } = request.body as {
+      messages: UIMessage[];
+    };
+
+    const result = aiClient.handleEntity(await convertToModelMessages(messages));
+    const response = result.toUIMessageStreamResponse();
+
+    reply.raw.writeHead(response.status, Object.fromEntries(Object.entries(response.headers)));
+
+    if (response.body) {
+      const reader = response.body.getReader();
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        reply.raw.write(value);
+      }
+    }
+
+    reply.raw.end();
+    return reply;
+  });
+}