sonamu 0.6.0 → 0.7.0

package/src/template/implementations/service.template.ts

@@ -1,18 +1,21 @@
+import assert from "assert";
 import inflection from "inflection";
-import * as _ from "lodash-es";
-import { TemplateOptions } from "../../types/types";
-import { EntityNamesRecord } from "../../entity/entity-manager";
-import { ApiParamType, ApiParam } from "../../types/types";
+import { diff, group, sort, unique } from "radashi";
 import {
-  apiParamTypeToTsType,
   apiParamToTsCode,
-  unwrapPromiseOnce,
-  zodTypeToTsTypeDef,
   apiParamToTsCodeAsObject,
+  apiParamTypeToTsType,
+  unwrapPromiseOnce,
 } from "../../api/code-converters";
-import { ExtendedApi } from "../../api/decorators";
-import { Template } from "../template";
+import type { ExtendedApi } from "../../api/decorators";
 import { Sonamu } from "../../api/sonamu";
+import type { EntityNamesRecord } from "../../entity/entity-manager";
+import { Naite } from "../../naite/naite";
+import type { TemplateOptions } from "../../types/types";
+import { type ApiParam, ApiParamType } from "../../types/types";
+import { assertDefined } from "../../utils/utils";
+import { Template } from "../template";
+import { zodTypeToTsTypeDef } from "../zod-converter";
 
 export class Template__service extends Template {
   constructor() {
@@ -27,36 +30,32 @@ export class Template__service extends Template {
   }
 
   render({ namesRecord }: TemplateOptions["service"]) {
+    Naite.t("render", { namesRecord });
+
     const {
       syncer: { apis },
     } = Sonamu;
 
-    const apisForThisModel = apis.filter(
-      (api) => api.modelName === `${namesRecord.capital}Model`
-    );
+    const apisForThisModel = apis.filter((api) => api.modelName === `${namesRecord.capital}Model`);
 
     // 서비스 TypeSource
     const { lines, importKeys } = this.getTypeSource(apisForThisModel);
 
     // AxiosProgressEvent 있는지 확인
     const hasAxiosProgressEvent = apis.find((api) =>
-      (api.options.clients ?? []).includes("axios-multipart")
+      (api.options.clients ?? []).includes("axios-multipart"),
     );
 
     return {
       ...this.getTargetAndPath(namesRecord),
       body: lines.join("\n"),
-      importKeys: importKeys.filter(
-        (key) => ["ListResult"].includes(key) === false
-      ),
+      importKeys: importKeys.filter((key) => ["ListResult"].includes(key) === false),
       customHeaders: [
         `import { z } from 'zod';`,
         `import qs from "qs";`,
-        `import useSWR, { SWRResponse } from "swr";`,
+        `import useSWR, { type SWRResponse } from "swr";`,
         `import { fetch, ListResult, SWRError, SwrOptions, handleConditional, swrPostFetcher, EventHandlers, SSEStreamOptions, useSSEStream } from '../sonamu.shared';`,
-        ...(hasAxiosProgressEvent
-          ? [`import { AxiosProgressEvent } from 'axios';`]
-          : []),
+        ...(hasAxiosProgressEvent ? [`import { type AxiosProgressEvent } from 'axios';`] : []),
       ],
     };
   }
@@ -70,10 +69,11 @@ export class Template__service extends Template {
     // 제네릭에서 선언한 타입, importKeys에서 제외 필요
     let typeParamNames: string[] = [];
 
-    const groups = _.groupBy(apis, (api) => api.modelName);
+    const groups = group(apis, (api) => api.modelName);
     const body = Object.keys(groups)
       .map((modelName) => {
         const methods = groups[modelName];
+        assert(methods);
         const methodCodes = methods
           .map((api) => {
             // 컨텍스트 제외된 파라미터 리스트
@@ -81,7 +81,7 @@ export class Template__service extends Template {
               (param) =>
                 !ApiParamType.isContext(param.type) &&
                 !ApiParamType.isRefKnex(param.type) &&
-                !(param.optional === true && param.name.startsWith("_")) // _로 시작하는 파라미터는 제외
+                !(param.optional === true && param.name.startsWith("_")), // _로 시작하는 파라미터는 제외
             );
 
             // 파라미터 타입 정의
@@ -91,40 +91,31 @@ export class Template__service extends Template {
               })
               .join(", ");
             typeParamNames = typeParamNames.concat(
-              api.typeParameters.map((typeParam) => typeParam.id)
+              api.typeParameters.map((typeParam) => typeParam.id),
             );
 
             // 파라미터 정의
-            const paramsDef = apiParamToTsCode(
-              paramsWithoutContext,
-              importKeys
-            );
+            const paramsDef = apiParamToTsCode(paramsWithoutContext, importKeys);
 
             // 파라미터 정의 (객체 형태)
-            const paramsDefAsObject = apiParamToTsCodeAsObject(
-              paramsWithoutContext,
-              importKeys
-            );
+            const paramsDefAsObject = apiParamToTsCodeAsObject(paramsWithoutContext, importKeys);
 
             // 리턴 타입 정의
             const returnTypeDef = apiParamTypeToTsType(
-              unwrapPromiseOnce(api.returnType),
-              importKeys
+              assertDefined(unwrapPromiseOnce(api.returnType)),
+              importKeys,
             );
 
             // 페이로드 데이터 정의
-            const payloadDef = `{ ${paramsWithoutContext
-              .map((param) => param.name)
-              .join(", ")} }`;
+            const payloadDef = `{ ${paramsWithoutContext.map((param) => param.name).join(", ")} }`;
 
             // 기본 URL
             const apiBaseUrl = `${Sonamu.config.api.route.prefix}${api.path}`;
 
+            const clients = api.options.clients ?? [];
             return [
               // 클라이언트별로 생성
-              ..._.sortBy(api.options.clients, (client) =>
-                client === "swr" ? 0 : 1
-              ).map((client) => {
+              ...sort(clients, (client) => (client === "swr" ? 0 : 1)).map((client) => {
                 switch (client) {
                   case "axios":
                     return this.renderAxios(
@@ -133,7 +124,7 @@ export class Template__service extends Template {
                       typeParamsDef,
                       paramsDef,
                       returnTypeDef,
-                      payloadDef
+                      payloadDef,
                     );
                   case "axios-multipart":
                     return this.renderAxiosMultipart(
@@ -142,7 +133,7 @@ export class Template__service extends Template {
                       typeParamsDef,
                       paramsDef,
                       returnTypeDef,
-                      paramsWithoutContext
+                      paramsWithoutContext,
                     );
                   case "swr":
                     return this.renderSwr(
@@ -151,7 +142,7 @@ export class Template__service extends Template {
                       typeParamsDef,
                       paramsDef,
                       returnTypeDef,
-                      payloadDef
+                      payloadDef,
                     );
                   case "window-fetch":
                     return this.renderWindowFetch(
@@ -159,16 +150,14 @@ export class Template__service extends Template {
                       apiBaseUrl,
                       typeParamsDef,
                       paramsDef,
-                      payloadDef
+                      payloadDef,
                     );
                   default:
                     return `// Not supported ${inflection.camelize(client, true)} yet.`;
                 }
               }),
               // 스트리밍인 경우
-              ...(api.streamOptions
-                ? [this.renderStream(api, apiBaseUrl, paramsDefAsObject)]
-                : []),
+              ...(api.streamOptions ? [this.renderStream(api, apiBaseUrl, paramsDefAsObject)] : []),
             ].join("\n");
           })
           .join("\n\n");
@@ -181,7 +170,7 @@ ${methodCodes}
 
     return {
       lines: [body],
-      importKeys: _.difference(_.uniq(importKeys), typeParamNames),
+      importKeys: diff(unique(importKeys), typeParamNames),
     };
   }
 
@@ -191,10 +180,10 @@ ${methodCodes}
     typeParamsDef: string,
     paramsDef: string,
     returnTypeDef: string,
-    payloadDef: string
+    payloadDef: string,
   ) {
     const methodNameAxios = api.options.resourceName
-      ? "get" + inflection.camelize(api.options.resourceName)
+      ? `get${inflection.camelize(api.options.resourceName)}`
       : api.methodName;
 
     if (api.options.httpMethod === "GET") {
@@ -227,7 +216,7 @@ export async function ${methodNameAxios}${typeParamsDef}(${paramsDef}): Promise<
     typeParamsDef: string,
     paramsDef: string,
     returnTypeDef: string,
-    paramsWithoutContext: ApiParam[]
+    paramsWithoutContext: ApiParam[],
   ) {
     const isMultiple = api.uploadOptions?.mode === "multiple";
     const fileParamName = isMultiple ? "files" : "file";
@@ -235,17 +224,15 @@ export async function ${methodNameAxios}${typeParamsDef}(${paramsDef}): Promise<
 
     const formDataDef = isMultiple
       ? [
-          `${fileParamName}.forEach(f => formData.append("${fileParamName}", f));`,
+          `${fileParamName}.forEach(f => { formData.append("${fileParamName}", f) } ); `,
           ...paramsWithoutContext.map(
-            (param) =>
-              `formData.append('${param.name}', String(${param.name}));`
+            (param) => `formData.append('${param.name}', String(${param.name}));`,
           ),
         ].join("\n")
       : [
           `formData.append("${fileParamName}", ${fileParamName});`,
           ...paramsWithoutContext.map(
-            (param) =>
-              `formData.append('${param.name}', String(${param.name}));`
+            (param) => `formData.append('${param.name}', String(${param.name}));`,
           ),
         ].join("\n");
 
@@ -278,23 +265,21 @@ export async function ${api.methodName}${typeParamsDef}(
     typeParamsDef: string,
     paramsDef: string,
     returnTypeDef: string,
-    payloadDef: string
+    payloadDef: string,
   ) {
     const methodNameSwr = api.options.resourceName
-      ? "use" + inflection.camelize(api.options.resourceName)
-      : "use" + inflection.camelize(api.methodName);
-    return `  export function ${inflection.camelize(
-      methodNameSwr,
-      true
-    )}${typeParamsDef}(${[paramsDef, "swrOptions?: SwrOptions"]
+      ? `use${inflection.camelize(api.options.resourceName)}`
+      : `use${inflection.camelize(api.methodName)}`;
+    return `  export function ${inflection.camelize(methodNameSwr, true)}${typeParamsDef}(${[
+      paramsDef,
+      "swrOptions?: SwrOptions",
+    ]
       .filter((p) => p !== "")
       .join(",")}, ): SWRResponse<${returnTypeDef}, SWRError> {
     return useSWR(handleConditional([
       \`${apiBaseUrl}\`,
       ${payloadDef},
-    ], swrOptions?.conditional)${
-      api.options.httpMethod === "POST" ? ", swrPostFetcher" : ""
-    }${
+    ], swrOptions?.conditional)${api.options.httpMethod === "POST" ? ", swrPostFetcher" : ""}${
       api.options.timeout ? `, { loadingTimeout: ${api.options.timeout} }` : ""
     });
   }`;
@@ -305,35 +290,26 @@ export async function ${api.methodName}${typeParamsDef}(
     apiBaseUrl: string,
     typeParamsDef: string,
     paramsDef: string,
-    payloadDef: string
+    payloadDef: string,
   ) {
     return `
 export async function ${api.methodName}${typeParamsDef}(${paramsDef}): Promise<Response> {
     return window.fetch(\`${apiBaseUrl}?\${qs.stringify(${payloadDef})}\`${
-      api.options.timeout
-        ? `, { signal: AbortSignal.timeout(${api.options.timeout}) }`
-        : ""
+      api.options.timeout ? `, { signal: AbortSignal.timeout(${api.options.timeout}) }` : ""
     });
 }
     `.trim();
   }
 
-  renderStream(
-    api: ExtendedApi,
-    apiBaseUrl: string,
-    paramsDefAsObject: string
-  ) {
+  renderStream(api: ExtendedApi, apiBaseUrl: string, paramsDefAsObject: string) {
     if (!api.streamOptions) {
       return "// streamOptions not found";
     }
 
     const methodNameStream = api.options.resourceName
-      ? "use" + inflection.camelize(api.options.resourceName)
-      : "use" + inflection.camelize(api.methodName);
-    const methodNameStreamCamelized = inflection.camelize(
-      methodNameStream,
-      true
-    );
+      ? `use${inflection.camelize(api.options.resourceName)}`
+      : `use${inflection.camelize(api.methodName)}`;
+    const methodNameStreamCamelized = inflection.camelize(methodNameStream, true);
 
     const eventsTypeDef = zodTypeToTsTypeDef(api.streamOptions.events);
 

package/src/template/implementations/view_enums_buttonset.template.ts

@@ -1,5 +1,5 @@
-import { TemplateOptions } from "../../types/types";
-import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { EntityManager, type EntityNamesRecord } from "../../entity/entity-manager";
+import type { TemplateOptions } from "../../types/types";
 import { Template } from "../template";
 
 export class Template__view_enums_buttonset extends Template {

package/src/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 "../template";
+import { EntityManager, type EntityNamesRecord } from "../../entity/entity-manager";
+import type { TemplateOptions } from "../../types/types";
 import { getLabel } from "../helpers";
+import { Template } from "../template";
 
 export class Template__view_enums_dropdown extends Template {
   constructor() {
@@ -50,4 +50,4 @@ export function ${enumId}Dropdown(props: DropdownProps) {
       importKeys: [],
     };
   }
-}
+}

package/src/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 "../template";
+import { EntityManager, type EntityNamesRecord } from "../../entity/entity-manager";
+import type { TemplateOptions } from "../../types/types";
 import { getLabel } from "../helpers";
+import { Template } from "../template";
 
 export class Template__view_enums_select extends Template {
   constructor() {

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

@@ -1,11 +1,11 @@
 import inflection from "inflection";
+import { unique } from "radashi";
 import { z } from "zod";
-import { RenderingNode, TemplateKey, TemplateOptions } from "../../types/types";
-import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
-import { RenderedTemplate } from "../template";
+import { EntityManager, type EntityNamesRecord } from "../../entity/entity-manager";
+import type { RenderingNode, TemplateKey, TemplateOptions } from "../../types/types";
+import { getEnumInfoFromColName, getRelationPropFromColName } from "../helpers";
+import type { 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 {
@@ -28,27 +28,17 @@ export class Template__view_form extends Template {
     ].join("\n");
   }
   wrapFG(body: string, label?: string): string {
-    return [
-      `<Form.Group widths="equal">`,
-      this.wrapFC(body, label),
-      `</Form.Group>`,
-    ].join("\n");
+    return [`<Form.Group widths="equal">`, this.wrapFC(body, label), `</Form.Group>`].join("\n");
   }
 
   renderColumnImport(entityId: string, col: RenderingNode) {
     if (col.renderType === "enums") {
-      const { id, targetEntityNames } = getEnumInfoFromColName(
-        entityId,
-        col.name
-      );
+      const { id, targetEntityNames } = getEnumInfoFromColName(entityId, col.name);
       const componentId = `${id}Select`;
       return `import { ${componentId} } from "src/components/${targetEntityNames.fs}/${componentId}";`;
     } else if (col.renderType === "number-fk_id") {
       try {
-        const relProp = getRelationPropFromColName(
-          entityId,
-          col.name.replace("_id", "")
-        );
+        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}";`;
@@ -64,17 +54,14 @@ export class Template__view_form extends Template {
     entityId: string,
     col: RenderingNode,
     names: EntityNamesRecord,
-    parent: string = ""
+    parent: string = "",
   ): string {
     let regExpr: string = "";
     regExpr = `{...register(\`${parent}${col.name}\`)}`;
 
     switch (col.renderType) {
       case "string-plain":
-        if (
-          col.zodType instanceof z.ZodString &&
-          (col.zodType.maxLength ?? 0) <= 512
-        ) {
+        if (col.zodType instanceof z.ZodString && (col.zodType.maxLength ?? 0) <= 512) {
           return `<Input placeholder="${col.label}" ${regExpr} />`;
         } else {
           return `<TextArea rows={8} placeholder="${col.label}" ${regExpr} />`;
@@ -112,10 +99,7 @@ export class Template__view_form extends Template {
         }
       case "number-fk_id":
         try {
-          const relProp = getRelationPropFromColName(
-            entityId,
-            col.name.replace("_id", "")
-          );
+          const relProp = getRelationPropFromColName(entityId, col.name.replace("_id", ""));
           const fkId = `${relProp.with}IdAsyncSelect`;
           return `<${fkId} {...register('${col.name}')} ${
             col.optional || col.nullable ? "clearable" : ""
@@ -128,9 +112,7 @@ export class Template__view_form extends Template {
       case "object":
         return `<>${col.name} object</>`;
       default:
-        throw new Error(
-          `대응 불가능한 렌더 타입 ${col.renderType} on ${col.name}`
-        );
+        throw new Error(`대응 불가능한 렌더 타입 ${col.renderType} on ${col.name}`);
     }
   }
 
@@ -167,7 +149,7 @@ export class Template__view_form extends Template {
         result[col.name] = value;
         return result;
       },
-      {} as { [key: string]: unknown }
+      {} as { [key: string]: unknown },
     );
   }
 
@@ -180,9 +162,7 @@ export class Template__view_form extends Template {
     const columns = (saveParamsNode.children as RenderingNode[])
       .filter((col) => col.name !== "id")
       .map((col) => {
-        const propCandidate = entity.props.find(
-          (prop) => prop.name === col.name
-        );
+        const propCandidate = entity.props.find((prop) => prop.name === col.name);
         col.label = propCandidate?.desc ?? col.label;
         return col;
       });
@@ -190,9 +170,7 @@ export class Template__view_form extends Template {
     const defaultValue = this.resolveDefaultValue(columns);
 
     // 프리 템플릿
-    const preTemplates: RenderedTemplate["preTemplates"] = (
-      columns as RenderingNode[]
-    )
+    const preTemplates: RenderedTemplate["preTemplates"] = (columns as RenderingNode[])
       .filter((col) => {
         if (col.name === "id") {
           return false;
@@ -219,16 +197,15 @@ export class Template__view_form extends Template {
         let enumId: string | undefined;
         if (col.renderType === "enums") {
           key = "view_enums_select";
-          const { targetEntityNames: targetMDNames, id } =
-            getEnumInfoFromColName(entityId, col.name);
+          const { targetEntityNames: targetMDNames, id } = getEnumInfoFromColName(
+            entityId,
+            col.name,
+          );
           targetMdId = targetMDNames.capital;
           enumId = id;
         } else {
           key = "view_id_async_select";
-          const relProp = getRelationPropFromColName(
-            entityId,
-            col.name.replace("_id", "")
-          );
+          const relProp = getRelationPropFromColName(entityId, col.name.replace("_id", ""));
           targetMdId = relProp.with;
         }
 
@@ -275,19 +252,15 @@ import { defaultCatch } from 'src/services/sonamu.shared';
 // 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
-      }.types';
-import { ${names.capital}Service } from 'src/services/${names.fs}/${
-        names.fs
-      }.service';
+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';
-${_.uniq(
+${unique(
   columns
     .filter((col) => ["number-fk_id", "enums"].includes(col.renderType))
     .map((col) => {
       return this.renderColumnImport(entityId, col);
-    })
+    }),
 ).join("\n")}
 
 export default function ${names.capitalPlural}FormPage() {
@@ -297,27 +270,20 @@ export default function ${names.capitalPlural}FormPage() {
     id: searchParams.get('id') ?? undefined,
   };
 
-  return <${
-    names.capitalPlural
-  }Form id={query?.id ? Number(query.id) : undefined} />;
+  return <${names.capitalPlural}Form id={query?.id ? Number(query.id) : undefined} />;
 }
 type ${names.capitalPlural}FormProps = {
   id?: number;
   mode?: 'page' | 'modal';
 };
-export function ${names.capitalPlural}Form({ id, mode }: ${
-        names.capitalPlural
-      }FormProps) {
+export function ${names.capitalPlural}Form({ id, mode }: ${names.capitalPlural}FormProps) {
   // 편집시 기존 row
   const [row, setRow] = useState<${names.capital}SubsetA | undefined>();
 
   // ${names.capital}SaveParams 폼
-  const { form, setForm, register } = useTypeForm(${
-    names.capital
-  }SaveParams, ${JSON.stringify(defaultValue).replace(
-    /"now\(\)"/g,
-    "DateTime.local().toSQL()!.slice(0, 19)"
-  )});
+  const { form, setForm, register } = useTypeForm(${names.capital}SaveParams, ${JSON.stringify(
+    defaultValue,
+  ).replace(/"now\(\)"/g, "DateTime.local().toSQL()!.slice(0, 19)")});
 
   // 수정일 때 기존 row 콜
   useEffect(() => {
@@ -330,10 +296,7 @@ export function ${names.capitalPlural}Form({ id, mode }: ${
             .filter((col) => col.renderType === "number-fk_id")
             .map((col) => {
               if (col.nullable) {
-                return `${col.name}: row.${col.name.replace(
-                  "_id",
-                  "?.id"
-                )} ?? null`;
+                return `${col.name}: row.${col.name.replace("_id", "?.id")} ?? null`;
               } else {
                 return `${col.name}: row.${col.name.replace("_id", ".id")}`;
               }
@@ -361,9 +324,7 @@ export function ${names.capitalPlural}Form({ id, mode }: ${
 
   // 페이지
   const PAGE = {
-    title: \`${
-      entity.title ?? names.capital
-    }\${id ? \`#\${id} 수정\` : ' 등록'}\`,
+    title: \`${entity.title ?? names.capital}\${id ? \`#\${id} 수정\` : ' 등록'}\`,
   }
 
   return (
@@ -386,7 +347,7 @@ export function ${names.capitalPlural}Form({ id, mode }: ${
                 if (col.name === "created_at") {
                   return `{form.id && (${this.wrapFG(
                     `<div className="p-8px">{formatDateTime(form.${col.name})}</div>`,
-                    "등록일시"
+                    "등록일시",
                   )})}`;
                 } else {
                   return this.wrapFG(
@@ -394,16 +355,14 @@ export function ${names.capitalPlural}Form({ id, mode }: ${
                     (() => {
                       if (col.label.endsWith("Id")) {
                         try {
-                          const entity = EntityManager.get(
-                            col.label.replace("Id", "")
-                          );
+                          const entity = EntityManager.get(col.label.replace("Id", ""));
                           return entity.title ?? col.label;
                         } catch {
                           return col.label;
                         }
                       }
                       return col.label;
-                    })()
+                    })(),
                   );
                 }
               })

package/src/template/implementations/view_id_all_select.template.ts

@@ -1,5 +1,5 @@
-import { TemplateOptions } from "../../types/types";
-import { EntityManager, EntityNamesRecord } from "../../entity/entity-manager";
+import { EntityManager, type EntityNamesRecord } from "../../entity/entity-manager";
+import type { TemplateOptions } from "../../types/types";
 import { Template } from "../template";
 
 export class Template__view_id_all_select extends Template {