sonamu 0.2.37 → 0.2.38

package/src/entity/entity.ts

@@ -1,6 +1,5 @@
-import { groupBy, uniq } from "lodash";
+import _ from "lodash";
 import { EntityManager as EntityManager } from "./entity-manager";
-import { dasherize, pluralize, underscore } from "inflection";
 import {
   EntityProp,
   RelationProp,
@@ -20,7 +19,7 @@ import {
 } from "../types/types";
 import inflection from "inflection";
 import path from "path";
-import { existsSync, writeFileSync } from "fs";
+import fs from "fs-extra";
 import { z } from "zod";
 import { Sonamu } from "../api/sonamu";
 import prettier from "prettier";
@@ -73,7 +72,7 @@ export class Entity {
     this.id = id;
     this.parentId = parentId;
     this.title = title ?? this.id;
-    this.table = table ?? underscore(pluralize(id));
+    this.table = table ?? inflection.underscore(inflection.pluralize(id));
 
     // props
     if (props) {
@@ -128,8 +127,10 @@ export class Entity {
 
     // names
     this.names = {
-      parentFs: dasherize(underscore(parentId ?? id)).toLowerCase(),
-      fs: dasherize(underscore(id)).toLowerCase(),
+      parentFs: inflection
+        .dasherize(inflection.underscore(parentId ?? id))
+        .toLowerCase(),
+      fs: inflection.dasherize(inflection.underscore(id)).toLowerCase(),
       module: id,
     };
 
@@ -158,7 +159,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;
@@ -271,7 +272,7 @@ export class Entity {
                 to = `${joinAs}.id`;
               } else {
                 from = `${fromTable}.id`;
-                to = `${joinAs}.${underscore(
+                to = `${joinAs}.${inflection.underscore(
                   this.names.fs.replace(/\-/g, "_")
                 )}_id`;
               }
@@ -302,6 +303,7 @@ export class Entity {
                 manyJoin: loader.manyJoin,
                 oneJoins: loader.oneJoins,
                 select: loader.select,
+                loaders: loader.loaders,
               };
             });
 
@@ -575,7 +577,7 @@ export class Entity {
       `dist/application/${typesModulePath}.js`
     );
 
-    if (existsSync(typesFileDistPath)) {
+    if (fs.existsSync(typesFileDistPath)) {
       const importPath = path.relative(__dirname, typesFileDistPath);
       import(importPath).then((t) => {
         this.types = Object.keys(t).reduce((result, key) => {
@@ -629,7 +631,7 @@ export class Entity {
       `src/application/${this.names.parentFs}/${this.names.fs}.entity.json`
     );
     const json = this.toJson();
-    writeFileSync(
+    fs.writeFileSync(
       jsonPath,
       await prettier.format(JSON.stringify(json), {
         parser: "json",
@@ -650,7 +652,7 @@ export class Entity {
 
     const subsets = _subsets ?? this.subsets;
     const subsetKeys = Object.keys(subsets);
-    const allFields = uniq(subsetKeys.map((key) => subsets[key]).flat());
+    const allFields = _.uniq(subsetKeys.map((key) => subsets[key]).flat());
 
     return this.props.map((prop) => {
       if (

package/src/entity/migrator.ts

@@ -1,29 +1,11 @@
-import _, {
-  difference,
-  differenceBy,
-  differenceWith,
-  groupBy,
-  intersection,
-  intersectionBy,
-  pick,
-  sortBy,
-  sum,
-  uniq,
-  uniqBy,
-} from "lodash";
+import _ from "lodash";
 import knex, { Knex } from "knex";
 import prettier from "prettier";
 import chalk from "chalk";
 import { DateTime } from "luxon";
-import {
-  existsSync,
-  mkdirSync,
-  readdirSync,
-  unlinkSync,
-  writeFileSync,
-} from "fs";
+import fs from "fs-extra";
 import equal from "fast-deep-equal";
-import { capitalize, pluralize, singularize, underscore } from "inflection";
+import inflection from "inflection";
 import prompts from "prompts";
 import { execSync } from "child_process";
 import path from "path";
@@ -141,24 +123,26 @@ export class Migrator {
     const srcMigrationsDir = `${Sonamu.apiRootPath}/src/migrations`;
     const distMigrationsDir = `${Sonamu.apiRootPath}/dist/migrations`;
 
-    if (existsSync(srcMigrationsDir) === false) {
-      mkdirSync(srcMigrationsDir, {
+    if (fs.existsSync(srcMigrationsDir) === false) {
+      fs.mkdirSync(srcMigrationsDir, {
         recursive: true,
       });
     }
-    if (existsSync(distMigrationsDir) === false) {
-      mkdirSync(distMigrationsDir, {
+    if (fs.existsSync(distMigrationsDir) === false) {
+      fs.mkdirSync(distMigrationsDir, {
         recursive: true,
       });
     }
-    const srcMigrations = readdirSync(srcMigrationsDir)
+    const srcMigrations = fs
+      .readdirSync(srcMigrationsDir)
       .filter((f) => f.endsWith(".ts"))
       .map((f) => f.split(".")[0]);
-    const distMigrations = readdirSync(distMigrationsDir)
+    const distMigrations = fs
+      .readdirSync(distMigrationsDir)
       .filter((f) => f.endsWith(".js"))
       .map((f) => f.split(".")[0]);
 
-    const normal = intersection(srcMigrations, distMigrations)
+    const normal = _.intersection(srcMigrations, distMigrations)
       .map((filename) => {
         return {
           name: filename,
@@ -167,19 +151,23 @@ export class Migrator {
       })
       .sort((a, b) => (a > b ? 1 : -1));
 
-    const onlyTs = difference(srcMigrations, distMigrations).map((filename) => {
-      return {
-        name: filename,
-        path: path.join(srcMigrationsDir, filename) + ".ts",
-      };
-    });
+    const onlyTs = _.difference(srcMigrations, distMigrations).map(
+      (filename) => {
+        return {
+          name: filename,
+          path: path.join(srcMigrationsDir, filename) + ".ts",
+        };
+      }
+    );
 
-    const onlyJs = difference(distMigrations, srcMigrations).map((filename) => {
-      return {
-        name: filename,
-        path: path.join(distMigrationsDir, filename) + ".js",
-      };
-    });
+    const onlyJs = _.difference(distMigrations, srcMigrations).map(
+      (filename) => {
+        return {
+          name: filename,
+          path: path.join(distMigrationsDir, filename) + ".js",
+        };
+      }
+    );
 
     return {
       normal,
@@ -306,7 +294,7 @@ export class Migrator {
     }[]
   > {
     // get uniq knex configs
-    const configs = uniqBy(
+    const configs = _.uniqBy(
       targets
         .map((target) => ({
           connKey: target,
@@ -388,15 +376,15 @@ export class Migrator {
 
     const res = await Promise.all(
       delFiles.map((delFile) => {
-        if (existsSync(delFile)) {
+        if (fs.existsSync(delFile)) {
           console.log(chalk.red(`DELETE: ${delFile}`));
-          unlinkSync(delFile);
+          fs.unlinkSync(delFile);
           return delFiles.includes(".ts") ? 1 : 0;
         }
         return 0;
       })
     );
-    return sum(res);
+    return _.sum(res);
   }
 
   async generatePreparedCodes(): Promise<number> {
@@ -415,7 +403,7 @@ export class Migrator {
           .plus({ seconds: index })
           .toFormat("yyyyMMddHHmmss");
         const filePath = `${migrationsDir}/${dateTag}_${pcode.title}.ts`;
-        writeFileSync(filePath, pcode.formatted!);
+        fs.writeFileSync(filePath, pcode.formatted!);
         console.log(chalk.green(`MIGRTAION CREATED ${filePath}`));
       });
 
@@ -435,8 +423,8 @@ export class Migrator {
       return path.join(migrationsDir, df.file).replace(".js", ".ts");
     });
     for (let p of delList) {
-      if (existsSync(p)) {
-        unlinkSync(p);
+      if (fs.existsSync(p)) {
+        fs.unlinkSync(p);
       }
     }
     await this.cleanUpDist(true);
@@ -526,7 +514,7 @@ export class Migrator {
           .plus({ seconds: index })
           .toFormat("yyyyMMddHHmmss");
         const filePath = `${migrationsDir}/${dateTag}_${code.title}.ts`;
-        writeFileSync(filePath, code.formatted!);
+        fs.writeFileSync(filePath, code.formatted!);
         console.log(chalk.green(`MIGRTAION CREATED ${filePath}`));
       });
   }
@@ -551,14 +539,14 @@ export class Migrator {
           which,
           "migrations"
         );
-        if (existsSync(migrationPath) === false) {
-          mkdirSync(migrationPath, {
+        if (fs.existsSync(migrationPath) === false) {
+          fs.mkdirSync(migrationPath, {
             recursive: true,
           });
         }
-        const files = readdirSync(migrationPath).filter(
-          (filename) => filename.startsWith(".") === false
-        );
+        const files = fs
+          .readdirSync(migrationPath)
+          .filter((filename) => filename.startsWith(".") === false);
         r[which] = files;
         return r;
       },
@@ -568,7 +556,7 @@ export class Migrator {
       }
     );
 
-    const diffOnSrc = differenceBy(
+    const diffOnSrc = _.differenceBy(
       files.src,
       files.dist,
       (filename) => filename.split(".")[0]
@@ -579,7 +567,7 @@ export class Migrator {
       );
     }
 
-    const diffOnDist = differenceBy(
+    const diffOnDist = _.differenceBy(
       files.dist,
       files.src,
       (filename) => filename.split(".")[0]
@@ -604,7 +592,7 @@ export class Migrator {
         return path.join(Sonamu.apiRootPath, "dist", "migrations", filename);
       });
       filesToRm.map((filePath) => {
-        unlinkSync(filePath);
+        fs.unlinkSync(filePath);
       });
       console.log(chalk.green(`${filesToRm.length}건 삭제되었습니다!`));
     }
@@ -728,7 +716,7 @@ export class Migrator {
       });
 
     // 조인테이블만 추출
-    const joinTables = uniqBy(
+    const joinTables = _.uniqBy(
       entitySetsWithJoinTable.map((entitySet) => entitySet.joinTables).flat(),
       (joinTable) => {
         return joinTable.table;
@@ -786,11 +774,11 @@ export class Migrator {
                     }
                     return col;
                   };
-                  const entityColumns = sortBy(
+                  const entityColumns = _.sortBy(
                     entitySet.columns,
                     (a) => a.name
                   ).map(replaceColumnDefaultTo);
-                  const dbColumns = sortBy(dbSet.columns, (a) => a.name).map(
+                  const dbColumns = _.sortBy(dbSet.columns, (a) => a.name).map(
                     replaceColumnDefaultTo
                   );
 
@@ -804,13 +792,13 @@ export class Migrator {
               console.debug({ entityColumn, dbColumn });
                */
 
-                  const entityIndexes = sortBy(entitySet.indexes, (a) =>
+                  const entityIndexes = _.sortBy(entitySet.indexes, (a) =>
                     [
                       a.type,
                       ...a.columns.sort((c1, c2) => (c1 > c2 ? 1 : -1)),
                     ].join("-")
                   );
-                  const dbIndexes = sortBy(dbSet.indexes, (a) =>
+                  const dbIndexes = _.sortBy(dbSet.indexes, (a) =>
                     [
                       a.type,
                       ...a.columns.sort((c1, c2) => (c1 > c2 ? 1 : -1)),
@@ -845,10 +833,10 @@ export class Migrator {
                     };
                   };
 
-                  const entityForeigns = sortBy(entitySet.foreigns, (a) =>
+                  const entityForeigns = _.sortBy(entitySet.foreigns, (a) =>
                     [a.to, ...a.columns].join("-")
                   ).map((f) => replaceNoActionOnMySQL(f));
-                  const dbForeigns = sortBy(dbSet.foreigns, (a) =>
+                  const dbForeigns = _.sortBy(dbSet.foreigns, (a) =>
                     [a.to, ...a.columns].join("-")
                   ).map((f) => replaceNoActionOnMySQL(f));
 
@@ -929,7 +917,7 @@ export class Migrator {
       };
     });
 
-    const dbIndexesGroup = groupBy(
+    const dbIndexesGroup = _.groupBy(
       dbIndexes.filter(
         (dbIndex) =>
           dbIndex.Key_name !== "PRIMARY" &&
@@ -1180,8 +1168,8 @@ export class Migrator {
           const join = {
             from: `${entity.table}.id`,
             through: {
-              from: `${prop.joinTable}.${singularize(table1)}_id`,
-              to: `${prop.joinTable}.${singularize(table2)}_id`,
+              from: `${prop.joinTable}.${inflection.singularize(table1)}_id`,
+              to: `${prop.joinTable}.${inflection.singularize(table2)}_id`,
               onUpdate: prop.onUpdate,
               onDelete: prop.onDelete,
             },
@@ -1255,7 +1243,7 @@ export class Migrator {
           });
           r.foreigns.push({
             columns: [idColumnName],
-            to: `${underscore(pluralize(prop.with)).toLowerCase()}.id`,
+            to: `${inflection.underscore(inflection.pluralize(prop.with)).toLowerCase()}.id`,
             onUpdate: prop.onUpdate,
             onDelete: prop.onDelete,
           });
@@ -1349,7 +1337,7 @@ export class Migrator {
     if (indexes.length === 0) {
       return [];
     }
-    const lines = uniq(
+    const lines = _.uniq(
       indexes.reduce((r, index) => {
         r.push(
           `table.${index.type}([${index.columns
@@ -1490,7 +1478,7 @@ export class Migrator {
     console.table(
       columns.map((column) => {
         return {
-          ...pick(column, [
+          ..._.pick(column, [
             "name",
             "type",
             "nullable",
@@ -1523,7 +1511,7 @@ export class Migrator {
       console.table(
         indexes.map((index) => {
           return {
-            ...pick(index, ["type", "columns", "name"]),
+            ..._.pick(index, ["type", "columns", "name"]),
           };
         })
       );
@@ -1538,7 +1526,7 @@ export class Migrator {
       console.table(
         foreigns.map((foreign) => {
           return {
-            ...pick(foreign, ["columns", "to", "onUpdate", "onDelete"]),
+            ..._.pick(foreign, ["columns", "to", "onUpdate", "onDelete"]),
           };
         })
       );
@@ -1650,8 +1638,8 @@ export class Migrator {
 
     // 컬럼명 기준 비교
     const extraColumns = {
-      db: differenceBy(dbColumns, entityColumns, (col) => col.name),
-      entity: differenceBy(entityColumns, dbColumns, (col) => col.name),
+      db: _.differenceBy(dbColumns, entityColumns, (col) => col.name),
+      entity: _.differenceBy(entityColumns, dbColumns, (col) => col.name),
     };
     if (extraColumns.entity.length > 0) {
       columnsTo.add = columnsTo.add.concat(extraColumns.entity);
@@ -1661,17 +1649,17 @@ export class Migrator {
     }
 
     // 동일 컬럼명의 세부 필드 비교
-    const sameDbColumns = intersectionBy(
+    const sameDbColumns = _.intersectionBy(
       dbColumns,
       entityColumns,
       (col) => col.name
     );
-    const sameMdColumns = intersectionBy(
+    const sameMdColumns = _.intersectionBy(
       entityColumns,
       dbColumns,
       (col) => col.name
     );
-    columnsTo.alter = differenceWith(sameDbColumns, sameMdColumns, (a, b) =>
+    columnsTo.alter = _.differenceWith(sameDbColumns, sameMdColumns, (a, b) =>
       equal(a, b)
     );
 
@@ -1728,11 +1716,11 @@ export class Migrator {
         }
 
         // 컬럼 변경사항
-        const columnDiffUp = difference(
+        const columnDiffUp = _.difference(
           this.genColumnDefinitions([entityColumn]),
           this.genColumnDefinitions([dbColumn])
         );
-        const columnDiffDown = difference(
+        const columnDiffDown = _.difference(
           this.genColumnDefinitions([dbColumn]),
           this.genColumnDefinitions([entityColumn])
         );
@@ -1770,10 +1758,10 @@ export class Migrator {
       drop: [] as MigrationIndex[],
     };
     const extraIndexes = {
-      db: differenceBy(dbIndexes, entityIndexes, (col) =>
+      db: _.differenceBy(dbIndexes, entityIndexes, (col) =>
         [col.type, col.columns.join("-")].join("//")
       ),
-      entity: differenceBy(entityIndexes, dbIndexes, (col) =>
+      entity: _.differenceBy(entityIndexes, dbIndexes, (col) =>
         [col.type, col.columns.join("-")].join("//")
       ),
     };
@@ -1816,7 +1804,7 @@ export class Migrator {
           )
           .map(
             (index) =>
-              `table.drop${capitalize(index.type)}([${index.columns
+              `table.drop${inflection.capitalize(index.type)}([${index.columns
                 .map((columnName) => `'${columnName}'`)
                 .join(",")}])`
           ),
@@ -1834,7 +1822,7 @@ export class Migrator {
           )
           .map(
             (index) =>
-              `table.drop${capitalize(index.type)}([${index.columns
+              `table.drop${inflection.capitalize(index.type)}([${index.columns
                 .map((columnName) => `'${columnName}'`)
                 .join(",")}])`
           ),

package/src/smd/smd-manager.ts

@@ -1,6 +1,6 @@
 import chalk from "chalk";
-import { glob } from "glob";
-import { dasherize, underscore, pluralize, camelize } from "inflection";
+import glob from "glob";
+import inflection from "inflection";
 import _ from "lodash";
 import path from "path";
 import { SMD } from "./smd";
@@ -30,7 +30,7 @@ class SMDManagerClass {
     !doSilent && console.log(chalk.yellow(`autoload ${pathPattern}`));
 
     return new Promise((resolve) => {
-      glob(path.resolve(pathPattern!), (_err, files) => {
+      glob.glob(path.resolve(pathPattern!), (_err, files) => {
         const importPaths = files.map((filePath) =>
           path.relative(__dirname, filePath)
         );
@@ -117,17 +117,21 @@ class SMDManagerClass {
   getNamesFromId(smdId: string): EntityNamesRecord {
     // entityId가 단복수 동형 단어인 경우 List 붙여서 생성
     const pluralized =
-      pluralize(smdId) === smdId ? `${smdId}List` : pluralize(smdId);
+      inflection.pluralize(smdId) === smdId
+        ? `${smdId}List`
+        : inflection.pluralize(smdId);
 
     return {
-      fs: dasherize(underscore(smdId)).toLowerCase(),
-      fsPlural: dasherize(underscore(pluralized)).toLowerCase(),
-      camel: camelize(smdId, true),
-      camelPlural: camelize(pluralized, true),
+      fs: inflection.dasherize(inflection.underscore(smdId)).toLowerCase(),
+      fsPlural: inflection
+        .dasherize(inflection.underscore(pluralized))
+        .toLowerCase(),
+      camel: inflection.camelize(smdId, true),
+      camelPlural: inflection.camelize(pluralized, true),
       capital: smdId,
       capitalPlural: pluralized,
       upper: smdId.toUpperCase(),
-      constant: underscore(smdId).toUpperCase(),
+      constant: inflection.underscore(smdId).toUpperCase(),
     };
   }
 }

package/src/smd/smd.ts

@@ -1,5 +1,4 @@
-import _, { uniq } from "lodash";
-import { dasherize, pluralize, underscore } from "inflection";
+import _ from "lodash";
 import {
   EntityProp,
   RelationProp,
@@ -19,7 +18,7 @@ import {
 } from "../types/types";
 import inflection from "inflection";
 import path from "path";
-import { existsSync } from "fs";
+import fs from "fs-extra";
 import { z } from "zod";
 import { Sonamu } from "../api/sonamu";
 import { SMDManager } from "./smd-manager";
@@ -67,7 +66,7 @@ export class SMD {
     this.id = id;
     this.parentId = parentId;
     this.title = title ?? this.id;
-    this.table = table ?? underscore(pluralize(id));
+    this.table = table ?? inflection.underscore(inflection.pluralize(id));
 
     // props
     if (props) {
@@ -111,8 +110,8 @@ export class SMD {
     this.names = {
       fs:
         parentId === undefined
-          ? dasherize(underscore(id)).toLowerCase()
-          : dasherize(parentId).toLowerCase(),
+          ? inflection.dasherize(inflection.underscore(id)).toLowerCase()
+          : inflection.dasherize(parentId).toLowerCase(),
       module: id,
     };
 
@@ -254,7 +253,7 @@ export class SMD {
                 to = `${joinAs}.id`;
               } else {
                 from = `${fromTable}.id`;
-                to = `${joinAs}.${underscore(
+                to = `${joinAs}.${inflection.underscore(
                   this.names.fs.replace(/\-/g, "_")
                 )}_id`;
               }
@@ -518,7 +517,7 @@ export class SMD {
       `dist/application/${typesModulePath}.js`
     );
 
-    if (existsSync(typesFileDistPath)) {
+    if (fs.existsSync(typesFileDistPath)) {
       const importPath = path.relative(__dirname, typesFileDistPath);
       import(importPath).then((t) => {
         this.types = Object.keys(t).reduce((result, key) => {
@@ -537,14 +536,14 @@ export class SMD {
       Sonamu.apiRootPath,
       `/dist/application/${enumsModulePath}.js`
     );
-    if (existsSync(enumsFileDistPath)) {
+    if (fs.existsSync(enumsFileDistPath)) {
       const importPath = path.relative(__dirname, enumsFileDistPath);
       import(importPath).then((t) => {
         this.enums = Object.keys(t).reduce((result, key) => {
           SMDManager.setModulePath(key, enumsModulePath);
 
           // Enum Labels 별도 처리
-          if (key === underscore(this.id).toUpperCase()) {
+          if (key === inflection.underscore(this.id).toUpperCase()) {
             this.enumLabels = t[key];
           }
           return {
@@ -557,7 +556,7 @@ export class SMD {
   }
 
   registerTableSpecs(): void {
-    const uniqueColumns = uniq(
+    const uniqueColumns = _.uniq(
       this.indexes
         .filter((idx) => idx.type === "unique")
         .map((idx) => idx.columns)