sonamu 0.6.0 → 0.7.1

package/src/template/implementations/generated_sso.template.ts

@@ -1,16 +1,12 @@
-import {
-  isManyToManyRelationProp,
-  SubsetQuery,
-  TemplateOptions,
-} from "../../types/types";
-import { EntityManager } from "../../entity/entity-manager";
-import { Template } from "../template";
+import assert from "assert";
 import inflection from "inflection";
-import { SourceCode } from "./generated.template";
-import * as _ from "lodash-es";
-import { nonNullable } from "../../utils/utils";
+import { unique } from "radashi";
 import { Sonamu } from "../../api";
-import { Entity } from "../../entity/entity";
+import type { Entity } from "../../entity/entity";
+import { EntityManager } from "../../entity/entity-manager";
+import { isManyToManyRelationProp } from "../../types/types";
+import { Template } from "../template";
+import type { SourceCode } from "./generated.template";
 
 export class Template__generated_sso extends Template {
   constructor() {
@@ -26,46 +22,54 @@ export class Template__generated_sso extends Template {
     };
   }
 
-  render({}: TemplateOptions["generated_sso"]) {
+  render() {
     const entityIds = EntityManager.getAllIds();
     const entities = entityIds.map((id) => EntityManager.get(id));
 
-    const sourceCodes: SourceCode[] = entities
-      .map((entity) => {
-        if (
-          entity.parentId !== undefined ||
-          Object.keys(entity.subsets).length === 0
-        ) {
-          return null;
-        }
-        const subsetKeys = Object.keys(entity.subsets);
-        const subsetQueryObject = subsetKeys.reduce(
-          (r, subsetKey) => {
-            const subsetQuery = entity.getSubsetQuery(subsetKey);
-            r[subsetKey] = subsetQuery;
-            return r;
-          },
-          {} as {
-            [key: string]: SubsetQuery;
-          }
-        );
-
-        const subsetKeyTypeName = `${entity.names.module}SubsetKey`;
-        return {
-          label: `SubsetQuery: ${entity.id}`,
-          lines: [
-            `export const ${inflection.camelize(
-              entity.id,
-              true
-            )}SubsetQueries:{ [key in ${subsetKeyTypeName}]: SubsetQuery} = ${JSON.stringify(
-              subsetQueryObject
-            )};`,
-            "",
-          ],
-          importKeys: [subsetKeyTypeName],
-        };
-      })
-      .filter(nonNullable);
+    // SubsetQueries 생성 대상: 부모 엔티티가 없고 서브셋이 존재
+    const targetEntities = entities.filter(
+      (entity) => entity.parentId === undefined && Object.keys(entity.subsets).length > 0,
+    );
+
+    // SubsetQueries 생성
+    const sourceCodes: SourceCode[] = targetEntities.flatMap((entity) => {
+      const subsetKeys = Object.keys(entity.subsets);
+
+      const subsetKeyTypeName = `${entity.names.module}SubsetKey`;
+      const entityCamelName = inflection.camelize(entity.id, true);
+
+      // Puri 기반 SubsetQuery
+      const puriSubsetQuery: SourceCode = {
+        label: `SubsetQuery: ${entity.id}`,
+        lines: [
+          `export const ${entityCamelName}SubsetQueries = {`,
+          ...subsetKeys.map(
+            (subsetKey) => `${subsetKey}: (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => {
+            ${entity.getPuriSubsetQuery(subsetKey)};
+          },`,
+          ),
+          `};`,
+          "",
+        ],
+        importKeys: [],
+      };
+
+      // Puri 기반 SubsetLoadersQuery
+      const puriLoaderQuery: SourceCode = {
+        label: `LoaderQuery: ${entity.id}`,
+        lines: [
+          `export const ${entityCamelName}LoaderQueries = {`,
+          ...subsetKeys.map((subsetKey) => {
+            return `${subsetKey}: ${entity.getPuriLoaderQuery(subsetKey)},`;
+          }),
+          `} as const satisfies PuriLoaderQueries<${subsetKeyTypeName}>;`,
+          "",
+        ],
+        importKeys: [subsetKeyTypeName],
+      };
+
+      return [puriSubsetQuery, puriLoaderQuery];
+    });
 
     // DatabaseSchema 생성
     const dbSchemaSourceCode = this.getDatabaseSchemaSourceCode(entities);
@@ -78,26 +82,35 @@ export class Template__generated_sso extends Template {
         if (ts === null) {
           return result;
         }
+        assert(result);
         return {
-          lines: [...result!.lines, `// ${ts.label}`, ...ts.lines, ""],
-          importKeys: _.uniq([...result!.importKeys, ...ts.importKeys]),
+          lines: [...result.lines, `// ${ts.label}`, ...ts.lines, ""],
+          importKeys: unique([...result.importKeys, ...ts.importKeys]),
         };
       },
       {
         lines: [],
         importKeys: [],
-      } as Omit<SourceCode, "label">
+      } as Omit<SourceCode, "label">,
     );
 
     const body = sourceCode.lines.join("\n");
     const isUsingManyToManyBaseSchema = body.includes("ManyToManyBaseSchema");
+
+    const sonamuImports = [
+      "PuriWrapper",
+      "DatabaseSchemaExtend",
+      "PuriLoaderQueries",
+      isUsingManyToManyBaseSchema ? "ManyToManyBaseSchema" : "",
+    ]
+      .filter(Boolean)
+      .join(", ");
+
     return {
       ...this.getTargetAndPath(),
       body: sourceCode.lines.join("\n"),
       importKeys: sourceCode.importKeys,
-      customHeaders: [
-        `import { SubsetQuery, ${isUsingManyToManyBaseSchema ? "ManyToManyBaseSchema" : ""} } from "sonamu";`,
-      ],
+      customHeaders: [`import { ${sonamuImports} } from "sonamu";`],
     };
   }
 
@@ -106,20 +119,17 @@ export class Template__generated_sso extends Template {
       return null;
     }
 
-    const entitySchemaLines = entities.map(
-      (entity) => `${entity.table}: ${entity.id}BaseSchema;`
-    );
+    const entitySchemaLines = entities.map((entity) => `${entity.table}: ${entity.id}BaseSchema;`);
 
-    const joinTableSchemaLines = _.uniq(
+    const joinTables = unique(
       entities.flatMap((entity) =>
         entity.props.filter(isManyToManyRelationProp).map((prop) => {
           const fromTableKey = inflection.singularize(entity.table);
-          const toTableKey = inflection.singularize(
-            EntityManager.get(prop.with).table
-          );
-          return `${prop.joinTable}: ManyToManyBaseSchema<"${fromTableKey}", "${toTableKey}">;`;
-        })
-      )
+          const toTableKey = inflection.singularize(EntityManager.get(prop.with).table);
+          return { table: prop.joinTable, fromTableKey, toTableKey };
+        }),
+      ),
+      (joinTable) => joinTable.table,
     );
 
     return {
@@ -128,7 +138,10 @@ export class Template__generated_sso extends Template {
         `declare module "sonamu" {`,
         `  export interface DatabaseSchemaExtend {`,
         ...entitySchemaLines,
-        ...joinTableSchemaLines,
+        ...joinTables.map(
+          (joinTable) =>
+            `${joinTable.table}: ManyToManyBaseSchema<"${joinTable.fromTableKey}", "${joinTable.toTableKey}">;`,
+        ),
         `  }`,
         `}`,
       ],

package/src/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 "../template";
 import { Sonamu } from "../../api";
+import { EntityManager, type EntityNamesRecord } from "../../entity/entity-manager";
+import type { TemplateOptions } from "../../types/types";
+import { Template } from "../template";
 
 export class Template__init_types extends Template {
   constructor() {
@@ -21,9 +21,7 @@ export class Template__init_types extends Template {
     const names = EntityManager.getNamesFromId(entityId);
 
     const hasCreatedAt =
-      EntityManager.get(entityId).props.find(
-        (prop) => prop.name === "created_at"
-      ) !== undefined;
+      EntityManager.get(entityId).props.find((prop) => prop.name === "created_at") !== undefined;
 
     return {
       ...this.getTargetAndPath(names),

package/src/template/implementations/model.template.ts

@@ -1,9 +1,10 @@
-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 { EntityManager, type EntityNamesRecord } from "../../entity/entity-manager";
+import { Naite } from "../../naite/naite";
+import type { TemplateOptions } from "../../types/types";
+import { Template } from "../template";
 import { getZodTypeById, zodTypeToRenderingNode } from "../zod-converter";
+import { Template__view_list } from "./view_list.template";
 
 export class Template__model extends Template {
   constructor() {
@@ -20,6 +21,8 @@ export class Template__model extends Template {
   }
 
   async render({ entityId }: TemplateOptions["model"]) {
+    Naite.t("render", { entityId });
+
     const listParamsZodType = await getZodTypeById(`${entityId}ListParams`);
     const listParamsNode = zodTypeToRenderingNode(listParamsZodType);
 
@@ -35,20 +38,26 @@ export class Template__model extends Template {
     return {
       ...this.getTargetAndPath(names),
       body: `
-import { BaseModelClass, ListResult, asArray, NotFoundException, BadRequestException, api } from 'sonamu';
+import { BaseModelClass, type ListResult, asArray, NotFoundException, BadRequestException, api, exhaustive } from 'sonamu';
 import {
   ${entityId}SubsetKey,
   ${entityId}SubsetMapping,
 } from "../sonamu.generated";
 import {
   ${names.camel}SubsetQueries,
+  ${names.camel}LoaderQueries,
 } from "../sonamu.generated.sso";
 import { ${entityId}ListParams, ${entityId}SaveParams } from "./${names.fs}.types";
 
 /*
   ${entityId} Model
 */
-class ${entityId}ModelClass extends BaseModelClass {
+class ${entityId}ModelClass extends BaseModelClass<
+  ${entityId}SubsetKey,
+  ${entityId}SubsetMapping,
+  typeof ${names.camel}SubsetQueries,
+  typeof ${names.camel}LoaderQueries
+> {
   modelName = "${entityId}";
 
   @api({ httpMethod: "GET", clients: ["axios", "swr"], resourceName: "${entityId}" })
@@ -96,38 +105,38 @@ class ${entityId}ModelClass extends BaseModelClass {
     };
 
     // build queries
-    let { rows, total } = await this.runSubsetQuery({
+    const { qb, onSubset: _ } = this.getSubsetQueries(subset);
+    
+    // id
+    if (params.id) {
+      qb.whereIn("${entity.table}.id", asArray(params.id));
+    }
+
+    // search-keyword
+    if (params.search && params.keyword && params.keyword.length > 0) {
+      if (params.search === "id") {
+        qb.where("${entity.table}.id", Number(params.keyword));
+        // } else if (params.search === "field") {
+        //   qb.where("${entity.table}.field", "like", \`%\${params.keyword}%\`);
+      } else {
+        throw new BadRequestException(\`구현되지 않은 검색 필드 \${params.search}\`);
+      }
+    }
+      
+    // orderBy
+    if (params.orderBy) {
+      // default orderBy
+      if (params.orderBy === "id-desc") {
+        qb.orderBy("${entity.table}.id", "desc");
+      } else {
+        exhaustive(params.orderBy);
+      }
+    }
+    
+    const { rows, total } = await this.executeSubsetQuery({
       subset,
+      qb,
       params,
-      subsetQuery: ${names.camel}SubsetQueries[subset],
-      build: ({ qb }) => {
-        // id
-        if (params.id) {
-          qb.whereIn("${entity.table}.id", asArray(params.id));
-        }
-
-        // search-keyword
-        if (params.search && params.keyword && params.keyword.length > 0) {
-          if (params.search === "id") {
-            qb.where("${entity.table}.id", params.keyword);
-          // } else if (params.search === "field") {
-          //   qb.where("${entity.table}.field", "like", \`%\${params.keyword}%\`);
-          } else {
-            throw new BadRequestException(
-              \`구현되지 않은 검색 필드 \${params.search}\`
-            );
-          }
-        }
-
-        // orderBy
-        if (params.orderBy) {
-          // default orderBy
-          const [orderByField, orderByDirec] = params.orderBy.split("-");
-          qb.orderBy("${entity.table}." + orderByField, orderByDirec);
-        }
-
-        return qb;
-      },
       debug: false,
     });
 
@@ -144,7 +153,7 @@ class ${entityId}ModelClass extends BaseModelClass {
     const wdb = this.getPuri("w");
 
     // register
-    spa.map((sp) => {
+    spa.forEach((sp) => {
       wdb.ubRegister("${entity.table}", sp);
     });
 
@@ -169,7 +178,7 @@ class ${entityId}ModelClass extends BaseModelClass {
   }
 }
 
-export const ${entityId}Model = new ${entityId}ModelClass();
+export const ${entityId}Model = new ${entityId}ModelClass(${names.camel}SubsetQueries, ${names.camel}LoaderQueries);
       `.trim(),
       importKeys: [],
     };

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