sonamu 0.1.4 → 0.1.6

package/src/entity/entity.ts

@@ -1,4 +1,4 @@
-import _, { uniq } from "lodash";
+import { groupBy, uniq } from "lodash";
 import { EntityManager as EntityManager } from "./entity-manager";
 import { dasherize, pluralize, underscore } from "inflection";
 import {
@@ -158,7 +158,7 @@ export class Entity {
     prefix = prefix.replace(/\./g, "__");
 
     // 서브셋을 1뎁스만 분리하여 그룹핑
-    const subsetGroup = _.groupBy(fields, (field) => {
+    const subsetGroup = groupBy(fields, (field) => {
       if (field.includes(".")) {
         const [rel] = field.split(".");
         return rel;
@@ -604,6 +604,18 @@ export class Entity {
   }
 
   async save(): Promise<void> {
+    // sort: subsets
+    const subsetRows = this.getSubsetRows();
+    this.subsets = Object.fromEntries(
+      Object.entries(this.subsets).map(([subsetKey]) => {
+        return [
+          subsetKey,
+          this.subsetRowsToSubsetFields(subsetRows, subsetKey),
+        ];
+      })
+    );
+
+    // save
     const jsonPath = path.join(
       Sonamu.apiRootPath,
       `src/application/${this.names.parentFs}/${this.names.fs}.entity.json`
@@ -680,6 +692,24 @@ export class Entity {
     });
   }
 
+  subsetRowsToSubsetFields(
+    subsetRows: EntitySubsetRow[],
+    subsetKey: string
+  ): string[] {
+    return subsetRows
+      .map((subsetRow) => {
+        if (subsetRow.children.length > 0) {
+          return this.subsetRowsToSubsetFields(subsetRow.children, subsetKey);
+        } else if (subsetRow.has[subsetKey]) {
+          return subsetRow.prefixes.concat(subsetRow.field).join(".");
+        } else {
+          return null;
+        }
+      })
+      .filter(nonNullable)
+      .flat();
+  }
+
   async createProp(prop: EntityProp, at?: number): Promise<void> {
     if (!at) {
       this.props.push(prop);

package/src/shared/web.shared.ts.txt

@@ -4,6 +4,7 @@
 import type { AxiosRequestConfig } from "axios";
 import axios from "axios";
 import { z, ZodIssue } from "zod";
+import qs from 'qs';
 
 export async function fetch(options: AxiosRequestConfig) {
   try {
@@ -71,12 +72,23 @@ export type SWRError = {
   message: string;
   statusCode: number;
 };
-export async function swrFetcher(
-  url: string,
-  params: string = ""
-): Promise<any> {
+export async function swrFetcher(args: [string, object]): Promise<any> {
   try {
-    const res = await axios.get(url + "?" + params);
+    const [url, params] = args;
+    const res = await axios.get(`${url}?${qs.stringify(params)}`);
+    return res.data;
+  } catch (e: any) {
+    const error: any = new Error(
+      e.response.data.message ?? e.response.message ?? "Unknown"
+    );
+    error.statusCode = e.response?.data.statusCode ?? e.response.status;
+    throw error;
+  }
+}
+export async function swrPostFetcher(args: [string, object]): Promise<any> {
+  try {
+    const [url, params] = args;
+    const res = await axios.post(url, params);
     return res.data;
   } catch (e: any) {
     const error: any = new Error(
@@ -87,13 +99,13 @@ export async function swrFetcher(
   }
 }
 export function handleConditional(
-  route: string | string[],
+  args: [string, object],
   conditional?: () => boolean
-): string | string[] | null {
+): [string, object] | null {
   if (conditional) {
-    return conditional() ? route : null;
+    return conditional() ? args : null;
   }
-  return route;
+  return args;
 }
 
 /*

package/src/syncer/syncer.ts

@@ -1255,7 +1255,10 @@ export class Syncer {
     }
   }
 
-  async getColumnsNode(entityId: string, subsetKey: string) {
+  async getColumnsNode(
+    entityId: string,
+    subsetKey: string
+  ): Promise<RenderingNode> {
     const entity = await EntityManager.get(entityId);
     const subsetA = entity.subsets[subsetKey];
     if (subsetA === undefined) {

package/src/templates/service.template.ts

@@ -40,7 +40,7 @@ export class Template__service extends Template {
         `import { z } from 'zod';`,
         `import qs from "qs";`,
         `import useSWR, { SWRResponse } from "swr";`,
-        `import { fetch, ListResult, SWRError, SwrOptions, handleConditional } from '../sonamu.shared';`,
+        `import { fetch, ListResult, SWRError, SwrOptions, handleConditional, swrPostFetcher } from '../sonamu.shared';`,
       ],
     };
   }
@@ -241,10 +241,12 @@ export async function ${api.methodName}${typeParamsDef}(
     )}${typeParamsDef}(${[paramsDef, "options?: SwrOptions"]
       .filter((p) => p !== "")
       .join(",")}, ): SWRResponse<${returnTypeDef}, SWRError> {
-    return useSWR<${returnTypeDef}, SWRError>(handleConditional([
+    return useSWR(handleConditional([
       \`${apiBaseUrl}\`,
-      qs.stringify(${payloadDef}),
-    ], options?.conditional));
+      ${payloadDef},
+    ], options?.conditional)${
+      api.options.httpMethod === "POST" ? ", swrPostFetcher" : ""
+    });
   }`;
   }
 

package/src/templates/view_enums_dropdown.template.ts

@@ -14,13 +14,9 @@ export class Template__view_enums_dropdown extends Template {
     };
   }
 
-  render({
-    entityId,
-    enumId,
-    idConstant,
-  }: TemplateOptions["view_enums_dropdown"]) {
+  render({ entityId, enumId }: TemplateOptions["view_enums_dropdown"]) {
     const names = EntityManager.getNamesFromId(entityId);
-    const label = getLabel(idConstant);
+    const label = getLabel(enumId);
 
     return {
       ...this.getTargetAndPath(names, enumId),
@@ -31,14 +27,14 @@ import {
   DropdownProps,
 } from 'semantic-ui-react';
 
-import { ${names.constant} } from 'src/services/${names.fs}/${names.fs}.enums';
+import { ${enumId}Label } from 'src/services/${names.fs}/${names.fs}.generated';
 
 export function ${enumId}Dropdown(props: DropdownProps) {
-  const options = Object.entries(${names.constant}.${idConstant}).map(([key, { ko }]) => {
+  const options = Object.entries(${enumId}Label).map(([key, label]) => {
     return {
       key,
       value: key,
-      text: "${label}: " + ko,
+      text: "${label}: " + label,
     };
   });
   return (
@@ -55,13 +51,12 @@ export function ${enumId}Dropdown(props: DropdownProps) {
   }
 }
 
-export function getLabel(idConstant: string): string {
-  switch (idConstant) {
-    case "ORDER_BY":
-      return "정렬";
-    case "SEARCH_FIELD":
-      return "검색";
-    default:
-      return idConstant;
+export function getLabel(enumId: string): string {
+  if (enumId.endsWith("OrderBy")) {
+    return "정렬";
+  } else if (enumId.endsWith("SearchField")) {
+    return "검색";
+  } else {
+    return enumId;
   }
 }

package/src/templates/view_enums_select.template.ts

@@ -15,13 +15,9 @@ export class Template__view_enums_select extends Template {
     };
   }
 
-  render({
-    entityId,
-    enumId,
-    idConstant,
-  }: TemplateOptions["view_enums_select"]) {
+  render({ entityId, enumId }: TemplateOptions["view_enums_select"]) {
     const names = EntityManager.getNamesFromId(entityId);
-    const label = getLabel(idConstant);
+    const label = getLabel(enumId);
 
     return {
       ...this.getTargetAndPath(names, enumId),
@@ -32,7 +28,7 @@ import {
   DropdownProps,
 } from 'semantic-ui-react';
 
-import { ${enumId}, ${names.constant} } from 'src/services/${names.fs}/${names.fs}.enums';
+import { ${enumId}, ${enumId}Label } from 'src/services/${names.fs}/${names.fs}.generated';
 
 export type ${enumId}SelectProps = {
   placeholder?: string;
@@ -42,7 +38,7 @@ export function ${enumId}Select({placeholder, textPrefix, ...props}: ${enumId}Se
   const typeOptions = ${enumId}.options.map((key) => ({
     key,
     value: key,
-    text: (textPrefix ?? '${label}: ') + ${names.constant}.${idConstant}[key].ko,
+    text: (textPrefix ?? '${label}: ') + ${enumId}Label[key],
   }));
 
   return (

package/src/templates/view_form.template.ts

@@ -163,10 +163,17 @@ export class Template__view_form extends Template {
     { entityId }: TemplateOptions["view_form"],
     saveParamsNode: RenderingNode
   ) {
+    const entity = EntityManager.get(entityId);
     const names = EntityManager.getNamesFromId(entityId);
-    const columns = (saveParamsNode.children as RenderingNode[]).filter(
-      (col) => col.name !== "id"
-    );
+    const columns = (saveParamsNode.children as RenderingNode[])
+      .filter((col) => col.name !== "id")
+      .map((col) => {
+        const propCandidate = entity.props.find(
+          (prop) => prop.name === col.name
+        );
+        col.label = propCandidate?.desc ?? col.label;
+        return col;
+      });
 
     const defaultValue = this.resolveDefaultValue(columns);
 
@@ -198,16 +205,14 @@ export class Template__view_form extends Template {
         let key: TemplateKey;
         let targetMdId = entityId;
         let enumId: string | undefined;
-        let idConstant: string | undefined;
         if (col.renderType === "enums") {
           key = "view_enums_select";
-          const { targetMDNames, id, name } = getEnumInfoFromColName(
+          const { targetMDNames, id } = getEnumInfoFromColName(
             entityId,
             col.name
           );
           targetMdId = targetMDNames.capital;
           enumId = id;
-          idConstant = name;
         } else {
           key = "view_id_async_select";
           const relProp = getRelationPropFromColName(
@@ -223,7 +228,6 @@ export class Template__view_form extends Template {
             entityId: targetMdId,
             node: col,
             enumId,
-            idConstant,
           },
         };
       })
@@ -258,8 +262,8 @@ import { DateTime } from "luxon";
 
 import { BackLink, LinkInput, NumberInput, BooleanToggle, SQLDateTimeInput, SQLDateInput, useTypeForm, useGoBack } from "@sonamu-kit/react-sui";
 import { defaultCatch } from 'src/services/sonamu.shared';
-import { ImageUploader } from 'src/components/core/ImageUploader';
-import { useCommonModal } from "src/components/core/CommonModal";
+import { ImageUploader } from 'src/admin-common/ImageUploader';
+import { useCommonModal } from "src/admin-common/CommonModal";
 
 import { ${names.capital}SaveParams } from 'src/services/${names.fs}/${
         names.fs
@@ -349,7 +353,9 @@ export function ${names.capitalPlural}Form({ id, mode }: ${
 
   // 페이지
   const PAGE = {
-    title: \`${names.capital}\${id ? \`#\${id} 수정\` : ' 등록'}\`,
+    title: \`${
+      entity.title ?? names.capital
+    }\${id ? \`#\${id} 수정\` : ' 등록'}\`,
   }
 
   return (

package/src/templates/view_list.template.ts

@@ -6,6 +6,7 @@ import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
 import { isEnumProp, isRelationProp, RelationProp } from "../types/types";
 import { RenderedTemplate } from "../syncer/syncer";
 import { Template } from "./base-template";
+
 export class Template__view_list extends Template {
   constructor() {
     super("view_list");
@@ -55,20 +56,17 @@ export class Template__view_list extends Template {
         }<img src={${colName}} />}</>`;
       case "string-datetime":
         if (col.nullable) {
-          return `<span className="text-tiny">{${colName} === null ? '-' : DateTime.fromSQL(${colName}).toSQL().slice(0, 10)}</span>`;
+          return `<span className="text-tiny">{${colName} === null ? '-' : dateF(${colName})}</span>`;
         } else {
-          return `<span className="text-tiny">{DateTime.fromSQL(${colName}).toSQL().slice(0, 10)}</span>`;
+          return `<span className="text-tiny">{dateF(${colName})}</span>`;
         }
       case "boolean":
         return `<>{${colName} ? <Label color='green' circular>O</Label> : <Label color='grey' circular>X</Label> }</>`;
       case "enums":
-        const { targetMDNames, name } = getEnumInfoFromColName(
-          entityId,
-          col.name
-        );
-        return `<>{${col.nullable ? `${colName} && ` : ""}${
-          targetMDNames.constant
-        }.${name}[${colName}].ko}</>`;
+        const { id: enumId } = getEnumInfoFromColName(entityId, col.name);
+        return `<>{${
+          col.nullable ? `${colName} && ` : ""
+        }${enumId}Label[${colName}]}</>`;
       case "array-images":
         return `<>{ ${colName}.map(r => ${
           col.nullable ? `r && ` : ""
@@ -110,13 +108,11 @@ export class Template__view_list extends Template {
     names: EntityNamesRecord
   ): (string | null)[] {
     if (col.renderType === "enums") {
-      const { modulePath, targetMDNames } = getEnumInfoFromColName(
+      const { modulePath, id: enumId } = getEnumInfoFromColName(
         names.capital,
         col.name
       );
-      return [
-        `import { ${targetMDNames.constant} } from 'src/services/${modulePath}';`,
-      ];
+      return [`import { ${enumId}Label } from 'src/services/${modulePath}';`];
     } else if (col.renderType === "object") {
       try {
         const relProp = getRelationPropFromColName(entityId, col.name);
@@ -246,14 +242,16 @@ export class Template__view_list extends Template {
     listParamsNode: RenderingNode
   ) {
     const names = EntityManager.getNamesFromId(entityId);
+    const entity = EntityManager.get(entityId);
 
     // 실제 리스트 컬럼
     const columns = (columnsNode.children as RenderingNode[])
       .filter((col) => col.name !== "id")
       .map((col) => {
+        const propCandidate = entity.props.find((p) => p.name === col.name);
         return {
           name: col.name,
-          label: col.label,
+          label: propCandidate?.desc ?? col.label,
           tc: `(row) => ${this.renderColumn(entityId, col, names)}`,
         };
       });
@@ -277,24 +275,21 @@ export class Template__view_list extends Template {
       let key: TemplateKey;
       let targetMdId = entityId;
       let enumId: string | undefined;
-      let idConstant: string | undefined;
 
       if (col.renderType === "enums") {
         if (col.name === "search") {
           key = "view_enums_dropdown";
           enumId = `${names.capital}SearchField`;
           targetMdId = names.capital;
-          idConstant = "SEARCH_FIELD";
         } else {
           key = "view_enums_select";
           try {
-            const { targetMDNames, id, name } = getEnumInfoFromColName(
+            const { targetMDNames, id } = getEnumInfoFromColName(
               entityId,
               col.name
             );
             targetMdId = targetMDNames.capital;
             enumId = id;
-            idConstant = name;
           } catch {
             continue;
           }
@@ -317,7 +312,6 @@ export class Template__view_list extends Template {
         options: {
           entityId: targetMdId,
           enumId,
-          idConstant,
         },
       });
     }
@@ -362,7 +356,7 @@ import {
 } from 'semantic-ui-react';
 import classNames from 'classnames';
 import { DateTime } from "luxon";
-import { DelButton, EditButton, AppBreadcrumbs, AddButton, useSelection, useListParams, SonamuCol, numF } from '@sonamu-kit/react-sui';
+import { DelButton, EditButton, AppBreadcrumbs, AddButton, useSelection, useListParams, SonamuCol, numF, dateF, datetimeF } from '@sonamu-kit/react-sui';
 
 import { ${names.capital}SubsetA } from "src/services/${names.fs}/${
         names.fs
@@ -391,11 +385,10 @@ export default function ${names.capital}List({}: ${names.capital}ListProps) {
   });
 
   // 리스트 쿼리
-  const { data, mutate, error } = ${names.capital}Service.use${
+  const { data, mutate, error, isLoading } = ${names.capital}Service.use${
         names.capitalPlural
       }('A', listParams);
   const { rows, total } = data ?? {};
-  const isLoading = !error && !data;
 
   // 삭제
   const confirmDel = (ids: number[]) => {
@@ -424,7 +417,7 @@ export default function ${names.capital}List({}: ${names.capital}ListProps) {
   // 현재 경로와 타이틀
   const PAGE = {
     route: '/admin/${names.fsPlural}',
-    title: '${names.capital}',
+    title: '${entity.title ?? names.capital}',
   };
 
   // 선택

package/src/types/types.ts

@@ -663,17 +663,14 @@ export const TemplateOptions = z.object({
   view_enums_select: z.object({
     entityId: z.string(),
     enumId: z.string(),
-    idConstant: z.string(),
   }),
   view_enums_dropdown: z.object({
     entityId: z.string(),
     enumId: z.string(),
-    idConstant: z.string(),
   }),
   view_enums_buttonset: z.object({
     entityId: z.string(),
     enumId: z.string(),
-    idConstant: z.string(),
   }),
 });
 export type TemplateOptions = z.infer<typeof TemplateOptions>;