sonamu 0.1.5 → 0.2.0

package/src/templates/view_form.template.ts

@@ -39,17 +39,24 @@ export class Template__view_form extends Template {
 
   renderColumnImport(entityId: string, col: RenderingNode) {
     if (col.renderType === "enums") {
-      const { id, targetMDNames } = getEnumInfoFromColName(entityId, col.name);
+      const { id, targetEntityNames: targetMDNames } = getEnumInfoFromColName(
+        entityId,
+        col.name
+      );
       const componentId = `${id}Select`;
       return `import { ${componentId} } from "src/components/${targetMDNames.fs}/${componentId}";`;
     } else if (col.renderType === "number-fk_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}";`;
+      try {
+        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}";`;
+      } catch {
+        return "";
+      }
     } else {
       throw new Error(`렌더 불가능한 임포트 ${col.name} ${col.renderType}`);
     }
@@ -99,7 +106,7 @@ export class Template__view_form extends Template {
           }
           return `<${enumId} ${regExpr} ${
             col.optional || col.nullable ? "clearable" : ""
-          } />`;
+          } textPrefix="" />`;
         } catch {
           return `<>찾을 수 없는 Enum ${col.name}</>`;
         }
@@ -114,7 +121,7 @@ export class Template__view_form extends Template {
             col.optional || col.nullable ? "clearable" : ""
           } subset="A" />`;
         } catch {
-          return `<>${col.name} 찾을 수 없음</>`;
+          return `<Input ${regExpr} />`;
         }
       case "array":
         return `<>${col.name} array</>`;
@@ -207,10 +214,8 @@ export class Template__view_form extends Template {
         let enumId: string | undefined;
         if (col.renderType === "enums") {
           key = "view_enums_select";
-          const { targetMDNames, id } = getEnumInfoFromColName(
-            entityId,
-            col.name
-          );
+          const { targetEntityNames: targetMDNames, id } =
+            getEnumInfoFromColName(entityId, col.name);
           targetMdId = targetMDNames.capital;
           enumId = id;
         } else {
@@ -271,9 +276,7 @@ import { ${names.capital}SaveParams } from 'src/services/${names.fs}/${
 import { ${names.capital}Service } from 'src/services/${names.fs}/${
         names.fs
       }.service';
-import { ${names.capital}SubsetA } from 'src/services/${names.fs}/${
-        names.fs
-      }.generated';
+import { ${names.capital}SubsetA } from 'src/services/sonamu.generated';
 ${uniq(
   columns
     .filter((col) => ["number-fk_id", "enums"].includes(col.renderType))
@@ -308,7 +311,7 @@ export function ${names.capitalPlural}Form({ id, mode }: ${
     names.capital
   }SaveParams, ${JSON.stringify(defaultValue).replace(
         /"now\(\)"/g,
-        "DateTime.local().toSQL().slice(0, 19)"
+        "DateTime.local().toSQL()!.slice(0, 19)"
       )});
 
   // 수정일 때 기존 row 콜
@@ -383,7 +386,19 @@ export function ${names.capitalPlural}Form({ id, mode }: ${
                 } else {
                   return this.wrapFG(
                     this.renderColumn(entityId, col, names),
-                    col.label
+                    (() => {
+                      if (col.label.endsWith("Id")) {
+                        try {
+                          const entity = EntityManager.get(
+                            col.label.replace("Id", "")
+                          );
+                          return entity.title ?? col.label;
+                        } catch {
+                          return col.label;
+                        }
+                      }
+                      return col.label;
+                    })()
                   );
                 }
               })

package/src/templates/view_id_async_select.template.ts

@@ -43,7 +43,7 @@ import React, { useState, useEffect, SyntheticEvent } from "react";
 import { DropdownProps, DropdownItemProps, DropdownOnSearchChangeData, Dropdown } from "semantic-ui-react";
 import { ${names.capital}SubsetKey, ${
         names.capital
-      }SubsetMapping } from "src/services/${names.fs}/${names.fs}.generated";
+      }SubsetMapping } from "src/services/sonamu.generated";
 import { ${names.capital}Service } from "src/services/${names.fs}/${
         names.fs
       }.service";
@@ -104,7 +104,7 @@ export function ${names.capital}IdAsyncSelect<T extends ${
 
   return (
     <Dropdown
-      placeholder="${names.constant}"
+      placeholder="${entity.title ?? names.constant}"
       selection
       options={options}
       onSearchChange={handleSearchChange}

package/src/templates/view_list.template.ts

@@ -74,7 +74,7 @@ export class Template__view_list extends Template {
       case "number-plain":
         return `<>{${col.nullable ? `${colName} && ` : ""}numF(${colName})}</>`;
       case "object":
-        return `<>{row.${col.name}.id}</>`;
+        return `<>{/* object ${colName} */}</>`;
       case "object-pick":
         const pickedChild = col.children!.find(
           (child) => child.name === col.config?.picked
@@ -89,14 +89,7 @@ export class Template__view_list extends Template {
           `${colName}${col.nullable ? "?" : ""}`
         );
       case "array":
-        const elementTableCell = this.renderColumn(
-          entityId,
-          col.element!,
-          names,
-          "elem",
-          true
-        );
-        return `<>{ ${colName} && ${colName}.map((elem, index) => <span key={index} className="ui button mini compact active">${elementTableCell}</span>) }</>`;
+        return `<>{ /* array ${colName} */ }</>`;
       default:
         throw new Error(`렌더 불가 컬럼 ${col.renderType}`);
     }
@@ -108,11 +101,10 @@ export class Template__view_list extends Template {
     names: EntityNamesRecord
   ): (string | null)[] {
     if (col.renderType === "enums") {
-      const { modulePath, id: enumId } = getEnumInfoFromColName(
-        names.capital,
-        col.name
-      );
-      return [`import { ${enumId}Label } from 'src/services/${modulePath}';`];
+      const { id: enumId } = getEnumInfoFromColName(names.capital, col.name);
+      return [
+        `import { ${enumId}Label } from 'src/services/sonamu.generated';`,
+      ];
     } else if (col.renderType === "object") {
       try {
         const relProp = getRelationPropFromColName(entityId, col.name);
@@ -145,10 +137,8 @@ export class Template__view_list extends Template {
         return `import { ${componentId} } from "src/components/${names.fs}/${componentId}";`;
       } else {
         try {
-          const { id, targetMDNames } = getEnumInfoFromColName(
-            entityId,
-            col.name
-          );
+          const { id, targetEntityNames: targetMDNames } =
+            getEnumInfoFromColName(entityId, col.name);
           const componentId = `${id}Select`;
           return `import { ${componentId} } from "src/components/${targetMDNames.fs}/${componentId}";`;
         } catch {
@@ -273,22 +263,22 @@ export class Template__view_list extends Template {
     const preTemplates: RenderedTemplate["preTemplates"] = [];
     for (let col of filterColumns) {
       let key: TemplateKey;
-      let targetMdId = entityId;
+      let targetEntityId = entityId;
       let enumId: string | undefined;
 
       if (col.renderType === "enums") {
         if (col.name === "search") {
           key = "view_enums_dropdown";
           enumId = `${names.capital}SearchField`;
-          targetMdId = names.capital;
+          targetEntityId = names.capital;
         } else {
           key = "view_enums_select";
           try {
-            const { targetMDNames, id } = getEnumInfoFromColName(
+            const { targetEntityNames, id } = getEnumInfoFromColName(
               entityId,
               col.name
             );
-            targetMdId = targetMDNames.capital;
+            targetEntityId = targetEntityNames.capital;
             enumId = id;
           } catch {
             continue;
@@ -301,7 +291,7 @@ export class Template__view_list extends Template {
             entityId,
             col.name.replace("_id", "")
           );
-          targetMdId = relProp.with;
+          targetEntityId = relProp.with;
         } catch {
           continue;
         }
@@ -310,7 +300,7 @@ export class Template__view_list extends Template {
       preTemplates.push({
         key,
         options: {
-          entityId: targetMdId,
+          entityId: targetEntityId,
           enumId,
         },
       });
@@ -358,9 +348,7 @@ import classNames from 'classnames';
 import { DateTime } from "luxon";
 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
-      }.generated";
+import { ${names.capital}SubsetA } from "src/services/sonamu.generated";
 import { ${names.capital}Service } from 'src/services/${names.fs}/${
         names.fs
       }.service';
@@ -570,42 +558,32 @@ export function getEnumInfoFromColName(
   colName: string
 ): {
   id: string;
-  targetMDNames: EntityNamesRecord;
-  targetMDId: string;
-  modulePath: string;
-  name: string;
+  targetEntityNames: EntityNamesRecord;
+  targetEntityId: string;
+  title: string;
 } {
-  const baseMd = EntityManager.get(entityId);
-  const prop = baseMd.props.find((p) => p.name === colName);
+  const baseEntity = EntityManager.get(entityId);
+  const prop = baseEntity.props.find((p) => p.name === colName);
   if (prop && isEnumProp(prop)) {
-    const modulePath = EntityManager.getModulePath(prop.id);
-    const targetMDId = camelize(modulePath.split("/")[0].replace("-", "_"));
-    const targetMDNames = EntityManager.getNamesFromId(targetMDId);
-    const name = underscore(
-      prop.id.replace(targetMDNames.capital, "")
-    ).toUpperCase();
     return {
       id: prop.id,
-      name,
-      targetMDId,
-      targetMDNames,
-      modulePath,
+      targetEntityId: entityId,
+      targetEntityNames: EntityManager.getNamesFromId(entityId),
+      title: prop.desc ?? prop.id,
     };
   } else {
     const idCandidate = camelize(
       underscore(entityId) + "_" + underscore(colName),
       false
     );
+    console.log({ idCandidate });
     try {
-      const modulePath = EntityManager.getModulePath(idCandidate);
       const targetMDNames = EntityManager.getNamesFromId(entityId);
-      const name = underscore(colName).toUpperCase();
       return {
         id: idCandidate,
-        name,
-        targetMDId: entityId,
-        targetMDNames,
-        modulePath,
+        targetEntityId: entityId,
+        targetEntityNames: targetMDNames,
+        title: idCandidate,
       };
     } catch {}
     throw new Error(`찾을 수 없는 EnumProp ${colName}`);
@@ -616,9 +594,13 @@ export function getRelationPropFromColName(
   entityId: string,
   colName: string
 ): RelationProp {
-  const baseMd = EntityManager.get(entityId);
-  const relProp = baseMd.props.find((prop) => prop.name === colName);
+  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/types/types.ts

@@ -612,9 +612,8 @@ export const TemplateOptions = z.object({
   init_types: z.object({
     entityId: z.string(),
   }),
-  generated: z.object({
-    entityId: z.string(),
-  }),
+  generated: z.object({}),
+  generated_sso: z.object({}),
   generated_http: z.object({
     entityId: z.string(),
   }),
@@ -679,6 +678,7 @@ export const TemplateKey = z.enum([
   "entity",
   "init_types",
   "generated",
+  "generated_sso",
   "generated_http",
   "model",
   "model_test",