sonamu 0.5.6 → 0.6.0

package/src/template/entity-converter.ts

@@ -0,0 +1,123 @@
+import z from "zod";
+import { EntityManager } from "../entity/entity-manager";
+import { ServiceUnavailableException } from "../exceptions/so-exceptions";
+import { EntityPropNode, RenderingNode } from "../types/types";
+import { zodTypeToRenderingNode, propToZodType } from "./zod-converter";
+
+/**
+ * 엔티티의 특정 subset을 RenderingNode로 변환합니다.
+ * subset의 필드들을 Zod 타입으로 변환한 후 UI 렌더링용 노드로 만듭니다.
+ * object와 array의 경우 적절한 pick 필드를 자동으로 선택합니다.
+ */
+export async function getColumnsNode(
+  entityId: string,
+  subsetKey: string
+): Promise<RenderingNode> {
+  const entity = EntityManager.get(entityId);
+  const subset = entity.subsets[subsetKey];
+  if (subset === undefined) {
+    throw new ServiceUnavailableException(`Subset ${subsetKey} 가 없습니다.`);
+  }
+  const propNodes = entity.fieldExprsToPropNodes(subset);
+  const rootPropNode: EntityPropNode = {
+    nodeType: "object",
+    children: propNodes,
+  };
+
+  const columnsZodType = (await propNodeToZodType(
+    rootPropNode
+  )) as z.ZodObject<any>;
+
+  const columnsNode = zodTypeToRenderingNode(columnsZodType);
+  columnsNode.children = columnsNode.children!.map((child) => {
+    if (child.renderType === "object") {
+      const pickedCol = child.children!.find((cc) =>
+        ["title", "name"].includes(cc.name)
+      );
+      if (pickedCol) {
+        return {
+          ...child,
+          renderType: "object-pick",
+          config: {
+            picked: pickedCol.name,
+          },
+        };
+      } else {
+        return child;
+      }
+    } else if (
+      child.renderType === "array" &&
+      child.element &&
+      child.element.renderType === "object"
+    ) {
+      const pickedCol = child.element!.children!.find((cc) =>
+        ["title", "name"].includes(cc.name)
+      );
+      if (pickedCol) {
+        return {
+          ...child,
+          element: {
+            ...child.element,
+            renderType: "object-pick",
+            config: {
+              picked: pickedCol.name,
+            },
+          },
+        };
+      } else {
+        return child;
+      }
+    }
+    return child;
+  });
+
+  return columnsNode;
+}
+
+/**
+ * EntityPropNode를 Zod 타입으로 변환합니다.
+ * plain, array, object 세 가지 nodeType을 재귀적으로 처리합니다.
+ */
+export async function propNodeToZodType(
+  propNode: EntityPropNode
+): Promise<z.ZodTypeAny> {
+  if (propNode.nodeType === "plain") {
+    return propToZodType(propNode.prop);
+  } else if (propNode.nodeType === "array") {
+    if (propNode.prop === undefined) {
+      throw new Error();
+    } else if (propNode.children.length > 0) {
+      return (
+        await propNodeToZodType({
+          ...propNode,
+          nodeType: "object",
+        })
+      ).array();
+    } else {
+      const innerType = await propToZodType(propNode.prop);
+      if (propNode.prop.nullable === true) {
+        return z.array(innerType).nullable();
+      } else {
+        return z.array(innerType);
+      }
+    }
+  } else if (propNode.nodeType === "object") {
+    const obj = await propNode.children.reduce(
+      async (promise, childPropNode) => {
+        const result = await promise;
+        result[childPropNode.prop!.name] =
+          await propNodeToZodType(childPropNode);
+        return result;
+      },
+      {} as any
+    );
+
+    if (propNode.prop?.nullable === true) {
+      return z.object(obj).nullable();
+    } else {
+      return z.object(obj);
+    }
+  } else {
+    throw Error;
+  }
+}

package/src/template/helpers.ts

@@ -0,0 +1,84 @@
+import inflection from "inflection";
+import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
+import { isEnumProp, isRelationProp, RelationProp } from "../types/types";
+
+/**
+ * Enum의 표시용 라벨을 가져옵니다.
+ * OrderBy, SearchField 등 특수한 경우와 일반 Enum을 구분하여 처리합니다.
+ */
+export function getLabel(entityId: string, enumId: string): string {
+  if (enumId.endsWith("OrderBy")) {
+    return "정렬";
+  } else if (enumId.endsWith("SearchField")) {
+    return "검색";
+  } else {
+    const enumProp = EntityManager.get(entityId).props.find(
+      (prop) => `${entityId}${inflection.camelize(prop.name)}` === enumId
+    );
+    if (enumProp && enumProp.desc) {
+      return enumProp.desc;
+    }
+    return enumId;
+  }
+}
+
+/**
+ * 컬럼 이름으로부터 Enum 정보를 추출합니다.
+ * Entity의 prop 중 enum 타입인 것을 찾아 관련 정보를 반환합니다.
+ */
+export function getEnumInfoFromColName(
+  entityId: string,
+  colName: string
+): {
+  id: string;
+  targetEntityNames: EntityNamesRecord;
+  targetEntityId: string;
+  title: string;
+} {
+  const baseEntity = EntityManager.get(entityId);
+  const prop = baseEntity.props.find((p) => p.name === colName);
+  if (prop && isEnumProp(prop)) {
+    return {
+      id: prop.id,
+      targetEntityId: entityId,
+      targetEntityNames: EntityManager.getNamesFromId(entityId),
+      title: prop.desc ?? prop.id,
+    };
+  } else {
+    const idCandidate = inflection.camelize(
+      inflection.underscore(entityId) + "_" + inflection.underscore(colName),
+      false
+    );
+    try {
+      const targetEntityNames = EntityManager.getNamesFromId(entityId);
+      return {
+        id: idCandidate,
+        targetEntityId: entityId,
+        targetEntityNames: targetEntityNames,
+        title: idCandidate,
+      };
+    } catch {}
+    throw new Error(`찾을 수 없는 EnumProp ${colName}`);
+  }
+}
+
+/**
+ * 컬럼 이름으로부터 Relation prop 정보를 가져옵니다.
+ * 관계형 prop이 아닌 경우 에러를 발생시킵니다.
+ */
+export function getRelationPropFromColName(
+  entityId: string,
+  colName: string
+): RelationProp {
+  const baseEntity = EntityManager.get(entityId);
+  const relProp = baseEntity.props.find((prop) => prop.name === colName);
+  if (isRelationProp(relProp)) {
+    const relEntity = EntityManager.get(relProp.with);
+    if (relEntity.parentId !== undefined) {
+      throw new Error("Only parent entities can be used as relation props");
+    }
+    return relProp;
+  } else {
+    throw new Error(`찾을 수 없는 Relation ${colName}`);
+  }
+}

package/src/{templates → template/implementations}/entity.template.ts

@@ -1,7 +1,7 @@
-import { TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
-import { Sonamu } from "../api";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
+import { Sonamu } from "../../api";
 
 export class Template__entity extends Template {
   constructor() {

package/src/{templates → template/implementations}/generated.template.ts

@@ -1,12 +1,12 @@
-import _ from "lodash";
-import { TemplateOptions } from "../types/types";
-import { EntityManager } from "../entity/entity-manager";
-import { Entity } from "../entity/entity";
-import { EntityPropNode } from "../types/types";
-import { propNodeToZodTypeDef, zodTypeToZodCode } from "../api/code-converters";
-import { Template } from "./base-template";
-import { nonNullable } from "../utils/utils";
-import { Sonamu } from "../api";
+import * as _ from "lodash-es";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager } from "../../entity/entity-manager";
+import { Entity } from "../../entity/entity";
+import { EntityPropNode } from "../../types/types";
+import { propNodeToZodTypeDef, zodTypeToZodCode } from "../../api/code-converters";
+import { Template } from "../template";
+import { nonNullable } from "../../utils/utils";
+import { Sonamu } from "../../api";
 
 export type SourceCode = {
   label: string;

package/src/{templates → template/implementations}/generated_http.template.ts

@@ -1,11 +1,11 @@
 import qs from "qs";
 import { z } from "zod";
-import { TemplateOptions } from "../types/types";
-import { getZodObjectFromApi } from "../api/code-converters";
-import { ExtendedApi } from "../api/decorators";
-import { Template } from "./base-template";
+import { TemplateOptions } from "../../types/types";
+import { getZodObjectFromApi } from "../../api/code-converters";
+import { ExtendedApi } from "../../api/decorators";
+import { Template } from "../template";
 import prettier from "prettier";
-import { Sonamu } from "../api/sonamu";
+import { Sonamu } from "../../api/sonamu";
 
 export class Template__generated_http extends Template {
   constructor() {
@@ -25,7 +25,9 @@ export class Template__generated_http extends Template {
     const {
       syncer: { types, apis },
       config: {
-        route: { prefix },
+        api: {
+          route: { prefix },
+        },
       },
     } = Sonamu;
 
@@ -170,6 +172,7 @@ export class Template__generated_http extends Template {
       };
       return def;
     } catch (error) {
+      console.error(error);
       throw new Error(
         `Invalid zod type detected on ${api.modelName}:${api.methodName}`
       );

package/src/{templates → template/implementations}/generated_sso.template.ts

@@ -2,15 +2,15 @@ import {
   isManyToManyRelationProp,
   SubsetQuery,
   TemplateOptions,
-} from "../types/types";
-import { EntityManager } from "../entity/entity-manager";
-import { Template } from "./base-template";
+} from "../../types/types";
+import { EntityManager } from "../../entity/entity-manager";
+import { Template } from "../template";
 import inflection from "inflection";
 import { SourceCode } from "./generated.template";
-import _ from "lodash";
-import { nonNullable } from "../utils/utils";
-import { Sonamu } from "../api";
-import { Entity } from "../entity/entity";
+import * as _ from "lodash-es";
+import { nonNullable } from "../../utils/utils";
+import { Sonamu } from "../../api";
+import { Entity } from "../../entity/entity";
 
 export class Template__generated_sso extends Template {
   constructor() {

package/src/{templates → template/implementations}/init_types.template.ts

@@ -1,7 +1,7 @@
-import { TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
-import { Sonamu } from "../api";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
+import { Sonamu } from "../../api";
 
 export class Template__init_types extends Template {
   constructor() {

package/src/{templates → template/implementations}/model.template.ts

@@ -1,8 +1,9 @@
-import { RenderingNode, TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
 import { Template__view_list } from "./view_list.template";
-import { Sonamu } from "../api";
+import { Sonamu } from "../../api";
+import { getZodTypeById, zodTypeToRenderingNode } from "../zod-converter";
 
 export class Template__model extends Template {
   constructor() {
@@ -18,11 +19,10 @@ export class Template__model extends Template {
     };
   }
 
-  render(
-    { entityId }: TemplateOptions["model"],
-    _columnsNode: RenderingNode,
-    listParamsNode: RenderingNode
-  ) {
+  async render({ entityId }: TemplateOptions["model"]) {
+    const listParamsZodType = await getZodTypeById(`${entityId}ListParams`);
+    const listParamsNode = zodTypeToRenderingNode(listParamsZodType);
+
     const names = EntityManager.getNamesFromId(entityId);
     const entity = EntityManager.get(entityId);
 

package/src/{templates → template/implementations}/model_test.template.ts

@@ -1,7 +1,7 @@
-import { TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
-import { Sonamu } from "../api";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
+import { Sonamu } from "../../api";
 
 export class Template__model_test extends Template {
   constructor() {
@@ -26,7 +26,7 @@ export class Template__model_test extends Template {
 import { describe, test, expect } from "vitest";
 import { bootstrap } from '../../testing/bootstrap';
 
-bootstrap([]);
+bootstrap();
 describe.skip("${entityId}ModelTest", () => {
   test("Query", async () => {
     expect(true).toBe(true);

package/src/{templates → template/implementations}/service.template.ts

@@ -1,18 +1,18 @@
 import inflection from "inflection";
-import _ from "lodash";
-import { TemplateOptions } from "../types/types";
-import { EntityNamesRecord } from "../entity/entity-manager";
-import { ApiParamType, ApiParam } from "../types/types";
+import * as _ from "lodash-es";
+import { TemplateOptions } from "../../types/types";
+import { EntityNamesRecord } from "../../entity/entity-manager";
+import { ApiParamType, ApiParam } from "../../types/types";
 import {
   apiParamTypeToTsType,
   apiParamToTsCode,
   unwrapPromiseOnce,
   zodTypeToTsTypeDef,
   apiParamToTsCodeAsObject,
-} from "../api/code-converters";
-import { ExtendedApi } from "../api/decorators";
-import { Template } from "./base-template";
-import { Sonamu } from "../api/sonamu";
+} from "../../api/code-converters";
+import { ExtendedApi } from "../../api/decorators";
+import { Template } from "../template";
+import { Sonamu } from "../../api/sonamu";
 
 export class Template__service extends Template {
   constructor() {
@@ -26,9 +26,17 @@ export class Template__service extends Template {
     };
   }
 
-  render({ namesRecord }: TemplateOptions["service"], apis: ExtendedApi[]) {
+  render({ namesRecord }: TemplateOptions["service"]) {
+    const {
+      syncer: { apis },
+    } = Sonamu;
+
+    const apisForThisModel = apis.filter(
+      (api) => api.modelName === `${namesRecord.capital}Model`
+    );
+
     // 서비스 TypeSource
-    const { lines, importKeys } = this.getTypeSource(apis);
+    const { lines, importKeys } = this.getTypeSource(apisForThisModel);
 
     // AxiosProgressEvent 있는지 확인
     const hasAxiosProgressEvent = apis.find((api) =>
@@ -110,7 +118,7 @@ export class Template__service extends Template {
               .join(", ")} }`;
 
             // 기본 URL
-            const apiBaseUrl = `${Sonamu.config.route.prefix}${api.path}`;
+            const apiBaseUrl = `${Sonamu.config.api.route.prefix}${api.path}`;
 
             return [
               // 클라이언트별로 생성
@@ -195,6 +203,7 @@ export async function ${methodNameAxios}${typeParamsDef}(${paramsDef}): Promise<
     return fetch({
       method: "GET",
       url: \`${apiBaseUrl}?\${qs.stringify(${payloadDef})}\`,
+      ${api.options.timeout ? `signal: AbortSignal.timeout(${api.options.timeout}),` : ""}
     });
 }
     `.trim();
@@ -205,6 +214,7 @@ export async function ${methodNameAxios}${typeParamsDef}(${paramsDef}): Promise<
       method: '${api.options.httpMethod}',
       url: \`${apiBaseUrl}\`,
       data: ${payloadDef},
+      ${api.options.timeout ? `signal: AbortSignal.timeout(${api.options.timeout}),` : ""}
     });
 }
       `.trim();
@@ -256,6 +266,7 @@ export async function ${api.methodName}${typeParamsDef}(
       },
       onUploadProgress,
       data: formData,
+      ${api.options.timeout ? `signal: AbortSignal.timeout(${api.options.timeout}),` : ""}
     });
   }
   `.trim();
@@ -283,6 +294,8 @@ export async function ${api.methodName}${typeParamsDef}(
       ${payloadDef},
     ], swrOptions?.conditional)${
       api.options.httpMethod === "POST" ? ", swrPostFetcher" : ""
+    }${
+      api.options.timeout ? `, { loadingTimeout: ${api.options.timeout} }` : ""
     });
   }`;
   }
@@ -296,7 +309,11 @@ export async function ${api.methodName}${typeParamsDef}(
   ) {
     return `
 export async function ${api.methodName}${typeParamsDef}(${paramsDef}): Promise<Response> {
-    return window.fetch(\`${apiBaseUrl}?\${qs.stringify(${payloadDef})}\`);
+    return window.fetch(\`${apiBaseUrl}?\${qs.stringify(${payloadDef})}\`${
+      api.options.timeout
+        ? `, { signal: AbortSignal.timeout(${api.options.timeout}) }`
+        : ""
+    });
 }
     `.trim();
   }

package/src/{templates → template/implementations}/view_enums_buttonset.template.ts

@@ -1,6 +1,6 @@
-import { TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
 
 export class Template__view_enums_buttonset extends Template {
   constructor() {

package/src/{templates → template/implementations}/view_enums_dropdown.template.ts

@@ -1,7 +1,7 @@
-import { TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
-import inflection from "inflection";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
+import { getLabel } from "../helpers";
 
 export class Template__view_enums_dropdown extends Template {
   constructor() {
@@ -50,20 +50,4 @@ export function ${enumId}Dropdown(props: DropdownProps) {
       importKeys: [],
     };
   }
-}
-
-export function getLabel(entityId: string, enumId: string): string {
-  if (enumId.endsWith("OrderBy")) {
-    return "정렬";
-  } else if (enumId.endsWith("SearchField")) {
-    return "검색";
-  } else {
-    const enumProp = EntityManager.get(entityId).props.find(
-      (prop) => `${entityId}${inflection.camelize(prop.name)}` === enumId
-    );
-    if (enumProp && enumProp.desc) {
-      return enumProp.desc;
-    }
-    return enumId;
-  }
-}
+}

package/src/{templates → template/implementations}/view_enums_select.template.ts

@@ -1,7 +1,7 @@
-import { TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
-import { getLabel } from "./view_enums_dropdown.template";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
+import { getLabel } from "../helpers";
 
 export class Template__view_enums_select extends Template {
   constructor() {

package/src/{templates → template/implementations}/view_form.template.ts

@@ -1,14 +1,12 @@
 import inflection from "inflection";
 import { z } from "zod";
-import { RenderingNode, TemplateKey, TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { RenderedTemplate } from "../syncer/syncer";
-import { Template } from "./base-template";
-import {
-  getEnumInfoFromColName,
-  getRelationPropFromColName,
-} from "./view_list.template";
-import _ from "lodash";
+import { RenderingNode, TemplateKey, TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { RenderedTemplate } from "../template";
+import { Template } from "../template";
+import { getRelationPropFromColName, getEnumInfoFromColName } from "../helpers";
+import * as _ from "lodash-es";
+import { getZodTypeById, zodTypeToRenderingNode } from "../zod-converter";
 
 export class Template__view_form extends Template {
   constructor() {
@@ -173,10 +171,10 @@ export class Template__view_form extends Template {
     );
   }
 
-  render(
-    { entityId }: TemplateOptions["view_form"],
-    saveParamsNode: RenderingNode
-  ) {
+  async render({ entityId }: TemplateOptions["view_form"]) {
+    const saveParamsZodType = await getZodTypeById(`${entityId}SaveParams`);
+    const saveParamsNode = zodTypeToRenderingNode(saveParamsZodType);
+
     const entity = EntityManager.get(entityId);
     const names = EntityManager.getNamesFromId(entityId);
     const columns = (saveParamsNode.children as RenderingNode[])

package/src/{templates → template/implementations}/view_id_all_select.template.ts

@@ -1,6 +1,6 @@
-import { TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
 
 export class Template__view_id_all_select extends Template {
   constructor() {

package/src/{templates → template/implementations}/view_id_async_select.template.ts

@@ -1,6 +1,6 @@
-import { TemplateOptions } from "../types/types";
-import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
-import { Template } from "./base-template";
+import { TemplateOptions } from "../../types/types";
+import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { Template } from "../template";
 
 export class Template__view_id_async_select extends Template {
   constructor() {