@nestia/migrate 6.0.4 → 6.0.6

package/src/programmers/MigrateDtoProgrammer.ts

@@ -2,6 +2,7 @@ import { OpenApi } from "@samchon/openapi";
 import { IPointer } from "tstl";
 import ts from "typescript";
 
+import { MigrateApplication } from "../MigrateApplication";
 import { FilePrinter } from "../utils/FilePrinter";
 import { MapUtil } from "../utils/MapUtil";
 import { StringUtil } from "../utils/StringUtil";
@@ -17,22 +18,22 @@ export namespace MigrateDtoProgrammer {
       | ((importer: MigrateImportProgrammer) => ts.TypeAliasDeclaration);
   }
 
-  export const compose = (
-    components: OpenApi.IComponents,
-  ): Map<string, IModule> => {
-    const dict: Map<string, IModule> = new Map();
-    for (const [key, value] of Object.entries(components.schemas ?? {})) {
-      const emendedKey: string = key
-        .split("/")
-        .filter((str) => str.length !== 0)
-        .map(StringUtil.escapeNonVariable)
-        .join("");
-      prepare(dict)(emendedKey)((importer) =>
-        writeAlias(components)(importer)(emendedKey, value),
-      );
-    }
-    return dict;
-  };
+  export const compose =
+    (config: MigrateApplication.IConfig) =>
+    (components: OpenApi.IComponents): Map<string, IModule> => {
+      const dict: Map<string, IModule> = new Map();
+      for (const [key, value] of Object.entries(components.schemas ?? {})) {
+        const emendedKey: string = key
+          .split("/")
+          .filter((str) => str.length !== 0)
+          .map(StringUtil.escapeNonVariable)
+          .join("");
+        prepare(dict)(emendedKey)((importer) =>
+          writeAlias(config)(components)(importer)(emendedKey, value),
+        );
+      }
+      return dict;
+    };
 
   const prepare =
     (dict: Map<string, IModule>) =>
@@ -58,6 +59,7 @@ export namespace MigrateDtoProgrammer {
     };
 
   const writeAlias =
+    (config: MigrateApplication.IConfig) =>
     (components: OpenApi.IComponents) =>
     (importer: MigrateImportProgrammer) =>
     (key: string, value: OpenApi.IJsonSchema) =>
@@ -68,20 +70,27 @@ export namespace MigrateDtoProgrammer {
           [],
           MigrateSchemaProgrammer.write(components)(importer)(value),
         ),
-        writeComment(value),
+        writeComment(config)(value, key.indexOf(".") === -1),
       );
 }
 
-const writeComment = (schema: OpenApi.IJsonSchema): string =>
-  [
-    ...(schema.description?.length ? [schema.description] : []),
-    ...(schema.description?.length &&
-    (schema.title !== undefined || schema.deprecated === true)
-      ? [""]
-      : []),
-    ...(schema.title !== undefined ? [`@title ${schema.title}`] : []),
-    ...(schema.deprecated === true ? [`@deprecated`] : []),
-  ]
-    .join("\n")
-    .split("*/")
-    .join("*\\/");
+const writeComment =
+  (config: MigrateApplication.IConfig) =>
+  (schema: OpenApi.IJsonSchema, top: boolean): string =>
+    [
+      ...(schema.description?.length ? [schema.description] : []),
+      ...(schema.description?.length &&
+      (schema.title !== undefined || schema.deprecated === true)
+        ? [""]
+        : []),
+      ...(schema.title !== undefined ? [`@title ${schema.title}`] : []),
+      ...(schema.deprecated === true ? [`@deprecated`] : []),
+      ...(top
+        ? [
+            `@${config.author?.tag ?? "nestia"} ${config.author?.value ?? "Generated by Nestia - https://github.com/samchon/nestia"}`,
+          ]
+        : []),
+    ]
+      .join("\n")
+      .split("*/")
+      .join("*\\/");

package/src/programmers/MigrateNestControllerProgrammer.ts

@@ -1,6 +1,7 @@
 import { OpenApi } from "@samchon/openapi";
 import ts from "typescript";
 
+import { MigrateApplication } from "../MigrateApplication";
 import { IHttpMigrateController } from "../structures/IHttpMigrateController";
 import { FilePrinter } from "../utils/FilePrinter";
 import { StringUtil } from "../utils/StringUtil";
@@ -9,6 +10,7 @@ import { MigrateNestMethodProgrammer } from "./MigrateNestMethodProgrammer";
 
 export namespace MigrateNestControllerProgrammer {
   export const write =
+    (config: MigrateApplication.IConfig) =>
     (components: OpenApi.IComponents) =>
     (controller: IHttpMigrateController): ts.Statement[] => {
       const importer: MigrateImportProgrammer = new MigrateImportProgrammer();
@@ -32,9 +34,14 @@ export namespace MigrateNestControllerProgrammer {
         controller.name,
         [],
         [],
-        controller.routes.map(
-          MigrateNestMethodProgrammer.write(components)(importer)(controller),
-        ),
+        controller.routes
+          .map((route, index) => [
+            ...(index !== 0 ? [FilePrinter.newLine() as any] : []),
+            MigrateNestMethodProgrammer.write(config)(components)(importer)(
+              controller,
+            )(route),
+          ])
+          .flat(),
       );
       return [
         ...importer.toStatements(

package/src/programmers/MigrateNestMethodProgrammer.ts

@@ -5,6 +5,7 @@ import { IdentifierFactory } from "typia/lib/factories/IdentifierFactory";
 import { LiteralFactory } from "typia/lib/factories/LiteralFactory";
 import { TypeFactory } from "typia/lib/factories/TypeFactory";
 
+import { MigrateApplication } from "../MigrateApplication";
 import { IHttpMigrateController } from "../structures/IHttpMigrateController";
 import { IHttpMigrateRoute } from "../structures/IHttpMigrateRoute";
 import { FilePrinter } from "../utils/FilePrinter";
@@ -14,6 +15,7 @@ import { MigrateSchemaProgrammer } from "./MigrateSchemaProgrammer";
 
 export namespace MigrateNestMethodProgrammer {
   export const write =
+    (config: MigrateApplication.IConfig) =>
     (components: OpenApi.IComponents) =>
     (importer: MigrateImportProgrammer) =>
     (controller: IHttpMigrateController) =>
@@ -68,14 +70,16 @@ export namespace MigrateNestMethodProgrammer {
           true,
         ),
       );
-      return FilePrinter.description(method, writeDescription(route));
+      return FilePrinter.description(method, writeDescription(config)(route));
     };
 
-  const writeDescription = (method: IHttpMigrateRoute): string =>
-    [
-      method.comment(),
-      "@nestia Generated by Nestia - https://github.com/samchon/nestia",
-    ].join("\n");
+  const writeDescription =
+    (config: MigrateApplication.IConfig) =>
+    (method: IHttpMigrateRoute): string =>
+      [
+        method.comment(),
+        `@${config.author?.tag ?? "nestia"} ${config.author?.value ?? "Generated by Nestia - https://github.com/samchon/nestia"}`,
+      ].join("\n");
 
   const writeMethodDecorators =
     (components: OpenApi.IComponents) =>

package/src/programmers/MigrateNestProgrammer.ts

@@ -25,12 +25,14 @@ export namespace MigrateNestProgrammer {
       ...controllers.map((c) => ({
         location: c.location,
         file: `${c.name}.ts`,
-        statements: MigrateNestControllerProgrammer.write(
+        statements: MigrateNestControllerProgrammer.write(program)(
           program.document.components,
         )(c),
       })),
       ...[
-        ...MigrateDtoProgrammer.compose(program.document.components).entries(),
+        ...MigrateDtoProgrammer.compose(program)(
+          program.document.components,
+        ).entries(),
       ].map(([key, value]) => ({
         location: "src/api/structures",
         file: `${key}.ts`,
@@ -76,6 +78,7 @@ export namespace MigrateNestProgrammer {
           ),
         );
       }
+      output.push(FilePrinter.newLine());
       return output;
     };
 }

package/src/programmers/MigrateSchemaProgrammer.ts

@@ -256,12 +256,17 @@ export namespace MigrateSchemaProgrammer {
     (schema: OpenApi.IJsonSchema.IObject): ts.TypeNode => {
       const regular = () =>
         ts.factory.createTypeLiteralNode(
-          Object.entries(schema.properties ?? []).map(([key, value]) =>
-            writeRegularProperty(components)(importer)(schema.required ?? [])(
-              key,
-              value,
-            ),
-          ),
+          Object.entries(schema.properties ?? [])
+            .map(([key, value], index) => [
+              ...(index !== 0
+                ? [ts.factory.createIdentifier("\n") as any]
+                : []),
+              writeRegularProperty(components)(importer)(schema.required ?? [])(
+                key,
+                value,
+              ),
+            ])
+            .flat(),
         );
       const dynamic = () =>
         ts.factory.createTypeLiteralNode([

package/src/structures/IHttpMigrateProgram.ts

@@ -12,11 +12,19 @@ export namespace IHttpMigrateProgram {
     simulate: boolean;
     e2e: boolean;
     document: OpenApi.IDocument;
+    author?: {
+      tag: string;
+      value: string;
+    };
   }
   export interface IConfig {
     mode: "nest" | "sdk";
     simulate: boolean;
     e2e: boolean;
+    author?: {
+      tag: string;
+      value: string;
+    };
   }
   export interface IError {
     method: string;

package/src/utils/FilePrinter.ts

@@ -23,7 +23,9 @@ export namespace FilePrinter {
     top?: string;
   }): string => {
     const script: string = ts
-      .createPrinter()
+      .createPrinter({
+        newLine: ts.NewLineKind.LineFeed,
+      })
       .printFile(
         ts.factory.createSourceFile(
           props.statements,