sonamu 0.1.2 → 0.1.5

package/src/templates/generated.template.ts

@@ -9,7 +9,7 @@ import {
 import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
 import { Entity } from "../entity/entity";
 import { EntityPropNode, SubsetQuery } from "../types/types";
-import { propNodeToZodTypeDef } from "../api/code-converters";
+import { propNodeToZodTypeDef, zodTypeToZodCode } from "../api/code-converters";
 import { Template } from "./base-template";
 
 export class Template__generated extends Template {
@@ -33,7 +33,7 @@ export class Template__generated extends Template {
       ...(entity.parentId === undefined
         ? [
             this.getBaseListParamsTypeSource(entity),
-            this.getSubsetTypeSource(entity),
+            this.getSubsetTypeSource(entity)!,
           ]
         : []),
     ].reduce(
@@ -52,6 +52,31 @@ export class Template__generated extends Template {
       }
     );
 
+    // .types.ts의 타입을 참조하는 경우 순환참조(상호참조)가 발생하므로 해당 타입을 가져와 인라인 처리
+    const entityTypeKeys = Object.keys(entity.types);
+    const cdImportKeys = uniq(typeSource.importKeys).filter((importKey) =>
+      entityTypeKeys.includes(importKey)
+    );
+    if (cdImportKeys.length > 0) {
+      typeSource.lines = [
+        ...cdImportKeys
+          .map((importKey) => [
+            `// Imported CustomScalar: ${importKey}`,
+            `const ${importKey} = ${zodTypeToZodCode(
+              entity.types[importKey]
+            )};`,
+            `type ${importKey} = z.infer<typeof ${importKey}>`,
+            "",
+          ])
+          .flat(),
+        "",
+        ...typeSource.lines,
+      ];
+      typeSource.importKeys = typeSource.importKeys.filter(
+        (importKey) => !cdImportKeys.includes(importKey)
+      );
+    }
+
     // targetAndPath
     const names = EntityManager.getNamesFromId(entityId);
     const targetAndPath = this.getTargetAndPath(names);

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

@@ -41,7 +41,7 @@ export type CommonProp = {
   nullable?: boolean;
   toFilter?: true;
   desc?: string;
-  dbDefault?: string | number | { raw: string };
+  dbDefault?: string;
 };
 export type IntegerProp = CommonProp & {
   type: "integer";
@@ -73,6 +73,8 @@ export type FloatProp = CommonProp & {
 export type DoubleProp = CommonProp & {
   type: "double";
   unsigned?: true;
+  precision: number;
+  scale: number;
 };
 export type DecimalProp = CommonProp & {
   type: "decimal";
@@ -113,7 +115,6 @@ export type RelationType =
   | "ManyToMany"
   | "OneToOne";
 export type RelationOn =
-  | "UPDATE"
   | "CASCADE"
   | "SET NULL"
   | "NO ACTION"
@@ -394,7 +395,7 @@ export type MigrationColumn = {
   nullable: boolean;
   unsigned?: boolean;
   length?: number;
-  defaultTo?: string | number;
+  defaultTo?: string;
   precision?: number;
   scale?: number;
 };
@@ -662,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>;

package/src/utils/utils.ts

@@ -14,11 +14,15 @@ export function globAsync(pathPattern: string): Promise<string[]> {
   });
 }
 export async function importMultiple(
-  filePaths: string[]
+  filePaths: string[],
+  doRefresh: boolean = false
 ): Promise<{ filePath: string; imported: any }[]> {
   return Promise.all(
     filePaths.map(async (filePath) => {
       const importPath = "./" + path.relative(__dirname, filePath);
+      if (doRefresh) {
+        delete require.cache[require.resolve(importPath)];
+      }
       const imported = await import(importPath);
       return {
         filePath,