@nestia/migrate 12.0.0-rc.2 → 12.0.0-rc.4

package/src/programmers/NestiaMigrateE2eFileProgrammer.ts

@@ -1,155 +1,155 @@
-import { NodeFlags, SyntaxKind, factory } from "@ttsc/factory";
-import { IHttpMigrateRoute } from "@typia/interface";
-import { OpenApi } from "typia";
-
-import { IdentifierFactory } from "../factories/IdentifierFactory";
-import { LiteralFactory } from "../factories/LiteralFactory";
-import ts from "../internal/ts";
-import { INestiaMigrateConfig } from "../structures/INestiaMigrateConfig";
-import { NestiaMigrateImportProgrammer } from "./NestiaMigrateImportProgrammer";
-import { NestiaMigrateSchemaProgrammer } from "./NestiaMigrateSchemaProgrammer";
-
-export namespace NestiaMigrateE2eFunctionProgrammer {
-  export interface IContext {
-    config: INestiaMigrateConfig;
-    components: OpenApi.IComponents;
-    importer: NestiaMigrateImportProgrammer;
-    route: IHttpMigrateRoute;
-  }
-
-  export const write = (ctx: IContext): ts.FunctionDeclaration =>
-    factory.createFunctionDeclaration(
-      [
-        factory.createModifier(SyntaxKind.ExportKeyword),
-        factory.createModifier(SyntaxKind.AsyncKeyword),
-      ],
-      undefined,
-      ["test", "api", ...ctx.route.accessor].join("_"),
-      undefined,
-      [
-        IdentifierFactory.parameter(
-          "connection",
-          factory.createTypeReferenceNode(
-            factory.createQualifiedName(
-              factory.createIdentifier(
-                ctx.importer.external({
-                  type: "default",
-                  library: "@ORGANIZATION/PROJECT-api",
-                  name: "api",
-                }),
-              ),
-              factory.createIdentifier("IConnection"),
-            ),
-          ),
-        ),
-      ],
-      undefined,
-      factory.createBlock(writeBody(ctx), true),
-    );
-
-  export const writeBody = (ctx: IContext): ts.Statement[] => [
-    factory.createVariableStatement(
-      [],
-      factory.createVariableDeclarationList(
-        [
-          factory.createVariableDeclaration(
-            "output",
-            undefined,
-            ctx.route.success
-              ? NestiaMigrateSchemaProgrammer.write({
-                  components: ctx.components,
-                  importer: ctx.importer,
-                  schema: ctx.route.success.schema,
-                })
-              : undefined,
-            factory.createAwaitExpression(writeCallExpressionn(ctx)),
-          ),
-        ],
-        NodeFlags.Const,
-      ),
-    ),
-    factory.createExpressionStatement(
-      factory.createCallExpression(
-        factory.createPropertyAccessExpression(
-          factory.createIdentifier(
-            ctx.importer.external({
-              type: "default",
-              library: "typia",
-              name: "typia",
-            }),
-          ),
-          "assert",
-        ),
-        undefined,
-        [factory.createIdentifier("output")],
-      ),
-    ),
-  ];
-
-  const writeCallExpressionn = (ctx: IContext): ts.CallExpression => {
-    const fetch = factory.createPropertyAccessExpression(
-      factory.createIdentifier("api.functional"),
-      factory.createIdentifier(ctx.route.accessor.join(".")),
-    );
-    const connection = factory.createIdentifier("connection");
-    if (
-      ctx.route.parameters.length === 0 &&
-      ctx.route.query === null &&
-      ctx.route.body === null
-    )
-      return factory.createCallExpression(fetch, undefined, [connection]);
-
-    const random = factory.createPropertyAccessExpression(
-      factory.createIdentifier(
-        ctx.importer.external({
-          type: "default",
-          library: "typia",
-          name: "typia",
-        }),
-      ),
-      "random",
-    );
-    if (ctx.config.keyword === true)
-      return factory.createCallExpression(fetch, undefined, [
-        connection,
-        LiteralFactory.write(
-          Object.fromEntries(
-            [...ctx.route.parameters, ctx.route.query, ctx.route.body]
-              .filter((x) => x !== null)
-              .map(({ key, schema: value }) => [
-                key,
-                factory.createCallExpression(
-                  random,
-                  [
-                    NestiaMigrateSchemaProgrammer.write({
-                      components: ctx.components,
-                      importer: ctx.importer,
-                      schema: value,
-                    }),
-                  ],
-                  undefined,
-                ),
-              ]),
-          ),
-        ),
-      ]);
-    return factory.createCallExpression(fetch, undefined, [
-      connection,
-      ...[...ctx.route.parameters, ctx.route.query, ctx.route.body]
-        .filter((p) => !!p)
-        .map((p) =>
-          factory.createCallExpression(
-            random,
-            [
-              NestiaMigrateSchemaProgrammer.write({
-                components: ctx.components,
-                importer: ctx.importer,
-                schema: p.schema,
-              }),
-            ],
-            undefined,
-          ),
-        ),
-    ]);
-  };
-}
+import { NodeFlags, SyntaxKind, factory } from "@ttsc/factory";
+import { IHttpMigrateRoute } from "@typia/interface";
+import { OpenApi } from "typia";
+
+import { IdentifierFactory } from "../factories/IdentifierFactory";
+import { LiteralFactory } from "../factories/LiteralFactory";
+import ts from "../internal/ts";
+import { INestiaMigrateConfig } from "../structures/INestiaMigrateConfig";
+import { NestiaMigrateImportProgrammer } from "./NestiaMigrateImportProgrammer";
+import { NestiaMigrateSchemaProgrammer } from "./NestiaMigrateSchemaProgrammer";
+
+export namespace NestiaMigrateE2eFunctionProgrammer {
+  export interface IContext {
+    config: INestiaMigrateConfig;
+    components: OpenApi.IComponents;
+    importer: NestiaMigrateImportProgrammer;
+    route: IHttpMigrateRoute;
+  }
+
+  export const write = (ctx: IContext): ts.FunctionDeclaration =>
+    factory.createFunctionDeclaration(
+      [
+        factory.createModifier(SyntaxKind.ExportKeyword),
+        factory.createModifier(SyntaxKind.AsyncKeyword),
+      ],
+      undefined,
+      ["test", "api", ...ctx.route.accessor].join("_"),
+      undefined,
+      [
+        IdentifierFactory.parameter(
+          "connection",
+          factory.createTypeReferenceNode(
+            factory.createQualifiedName(
+              factory.createIdentifier(
+                ctx.importer.external({
+                  type: "default",
+                  library: "@ORGANIZATION/PROJECT-api",
+                  name: "api",
+                }),
+              ),
+              factory.createIdentifier("IConnection"),
+            ),
+          ),
+        ),
+      ],
+      undefined,
+      factory.createBlock(writeBody(ctx), true),
+    );
+
+  export const writeBody = (ctx: IContext): ts.Statement[] => [
+    factory.createVariableStatement(
+      [],
+      factory.createVariableDeclarationList(
+        [
+          factory.createVariableDeclaration(
+            "output",
+            undefined,
+            ctx.route.success
+              ? NestiaMigrateSchemaProgrammer.write({
+                  components: ctx.components,
+                  importer: ctx.importer,
+                  schema: ctx.route.success.schema,
+                })
+              : undefined,
+            factory.createAwaitExpression(writeCallExpressionn(ctx)),
+          ),
+        ],
+        NodeFlags.Const,
+      ),
+    ),
+    factory.createExpressionStatement(
+      factory.createCallExpression(
+        factory.createPropertyAccessExpression(
+          factory.createIdentifier(
+            ctx.importer.external({
+              type: "default",
+              library: "typia",
+              name: "typia",
+            }),
+          ),
+          "assert",
+        ),
+        undefined,
+        [factory.createIdentifier("output")],
+      ),
+    ),
+  ];
+
+  const writeCallExpressionn = (ctx: IContext): ts.CallExpression => {
+    const fetch = factory.createPropertyAccessExpression(
+      factory.createIdentifier("api.functional"),
+      factory.createIdentifier(ctx.route.accessor.join(".")),
+    );
+    const connection = factory.createIdentifier("connection");
+    if (
+      ctx.route.parameters.length === 0 &&
+      ctx.route.query === null &&
+      ctx.route.body === null
+    )
+      return factory.createCallExpression(fetch, undefined, [connection]);
+
+    const random = factory.createPropertyAccessExpression(
+      factory.createIdentifier(
+        ctx.importer.external({
+          type: "default",
+          library: "typia",
+          name: "typia",
+        }),
+      ),
+      "random",
+    );
+    if (ctx.config.keyword === true)
+      return factory.createCallExpression(fetch, undefined, [
+        connection,
+        LiteralFactory.write(
+          Object.fromEntries(
+            [...ctx.route.parameters, ctx.route.query, ctx.route.body]
+              .filter((x) => x !== null)
+              .map(({ key, schema: value }) => [
+                key,
+                factory.createCallExpression(
+                  random,
+                  [
+                    NestiaMigrateSchemaProgrammer.write({
+                      components: ctx.components,
+                      importer: ctx.importer,
+                      schema: value,
+                    }),
+                  ],
+                  undefined,
+                ),
+              ]),
+          ),
+        ),
+      ]);
+    return factory.createCallExpression(fetch, undefined, [
+      connection,
+      ...[...ctx.route.parameters, ctx.route.query, ctx.route.body]
+        .filter((p) => !!p)
+        .map((p) =>
+          factory.createCallExpression(
+            random,
+            [
+              NestiaMigrateSchemaProgrammer.write({
+                components: ctx.components,
+                importer: ctx.importer,
+                schema: p.schema,
+              }),
+            ],
+            undefined,
+          ),
+        ),
+    ]);
+  };
+}

package/src/programmers/NestiaMigrateE2eProgrammer.ts

@@ -1,48 +1,62 @@
-import { IHttpMigrateRoute, OpenApi } from "@typia/interface";
-import ts from "../internal/ts";
-
-import { INestiaMigrateConfig } from "../structures/INestiaMigrateConfig";
-import { INestiaMigrateContext } from "../structures/INestiaMigrateContext";
-import { INestiaMigrateFile } from "../structures/INestiaMigrateFile";
-import { FilePrinter } from "../utils/FilePrinter";
-import { NestiaMigrateE2eFunctionProgrammer } from "./NestiaMigrateE2eFileProgrammer";
-import { NestiaMigrateImportProgrammer } from "./NestiaMigrateImportProgrammer";
-
-export namespace NestiaMigrateE2eProgrammer {
-  export const write = (ctx: INestiaMigrateContext): Record<string, string> =>
-    Object.fromEntries(
-      ctx.application.routes
-        .map((r) =>
-          writeFile(ctx.config, ctx.application.document().components, r),
-        )
-        .map((r) => [`${r.location}/${r.file}`, r.content]),
-    );
-
-  const writeFile = (
-    config: INestiaMigrateConfig,
-    components: OpenApi.IComponents,
-    route: IHttpMigrateRoute,
-  ): INestiaMigrateFile => {
-    const importer: NestiaMigrateImportProgrammer =
-      new NestiaMigrateImportProgrammer();
-    const func: ts.FunctionDeclaration =
-      NestiaMigrateE2eFunctionProgrammer.write({
-        config,
-        components,
-        importer,
-        route,
-      });
-    const statements: ts.Statement[] = [
-      ...importer.toStatements(
-        (name) => `@ORGANIZATION/PROJECT-api/lib/structures/${name}`,
-      ),
-      FilePrinter.newLine(),
-      func,
-    ];
-    return {
-      location: `test/features/api`,
-      file: `${["test", "api", ...route.accessor].join("_")}.ts`,
-      content: FilePrinter.write({ statements }),
-    };
-  };
-}
+import { IHttpMigrateRoute, OpenApi } from "@typia/interface";
+
+import ts from "../internal/ts";
+import { INestiaMigrateConfig } from "../structures/INestiaMigrateConfig";
+import { INestiaMigrateContext } from "../structures/INestiaMigrateContext";
+import { INestiaMigrateFile } from "../structures/INestiaMigrateFile";
+import { FilePrinter } from "../utils/FilePrinter";
+import { NestiaMigrateE2eFunctionProgrammer } from "./NestiaMigrateE2eFileProgrammer";
+import { NestiaMigrateImportProgrammer } from "./NestiaMigrateImportProgrammer";
+
+export namespace NestiaMigrateE2eProgrammer {
+  export const write = (ctx: INestiaMigrateContext): Record<string, string> =>
+    Object.fromEntries(
+      ctx.application.routes
+        .map((r) =>
+          writeFile(
+            ctx.mode,
+            ctx.config,
+            ctx.application.document().components,
+            r,
+          ),
+        )
+        .map((r) => [`${r.location}/${r.file}`, r.content]),
+    );
+
+  const writeFile = (
+    mode: INestiaMigrateContext["mode"],
+    config: INestiaMigrateConfig,
+    components: OpenApi.IComponents,
+    route: IHttpMigrateRoute,
+  ): INestiaMigrateFile => {
+    const importer: NestiaMigrateImportProgrammer =
+      new NestiaMigrateImportProgrammer();
+    const func: ts.FunctionDeclaration =
+      NestiaMigrateE2eFunctionProgrammer.write({
+        config,
+        components,
+        importer,
+        route,
+      });
+    const statements: ts.Statement[] = [
+      // The monorepo template consumes the api workspace package through its
+      // package name, while the single-package sdk template keeps resolving
+      // the built `lib` paths through tsconfig path mappings.
+      ...importer.toStatements((name) =>
+        mode === "nest"
+          ? "@ORGANIZATION/PROJECT-api"
+          : `@ORGANIZATION/PROJECT-api/lib/structures/${name}`,
+      ),
+      FilePrinter.newLine(),
+      func,
+    ];
+    return {
+      location:
+        mode === "nest"
+          ? `packages/backend/test/features/api`
+          : `test/features/api`,
+      file: `${["test", "api", ...route.accessor].join("_")}.ts`,
+      content: FilePrinter.write({ statements }),
+    };
+  };
+}

package/src/programmers/NestiaMigrateImportProgrammer.ts

@@ -1,119 +1,127 @@
-import { factory } from "@ttsc/factory";
-
-import { TypeLiteralFactory } from "../factories/TypeLiteralFactory";
-import ts from "../internal/ts";
-import { FilePrinter } from "../utils/FilePrinter";
-import { MapUtil } from "../utils/MapUtil";
-
-export class NestiaMigrateImportProgrammer {
-  private external_: Map<string, IClause> = new Map();
-  private dtos_: Set<string> = new Set();
-
-  public constructor() {}
-
-  public empty(): boolean {
-    return this.external_.size === 0 && this.dtos_.size === 0;
-  }
-
-  public external(props: MigrateImportProgrammer.IProps): string {
-    const clause: IClause = MapUtil.take(this.external_)(props.library)(() => ({
-      default: null,
-      instances: new Set(),
-    }));
-    const name: string = props.name.split(".")[0]!;
-    if (props.type === "default") clause.default = props.name;
-    else clause.instances.add(name);
-    return name;
-  }
-
-  public dto(name: string, namespace?: string): ts.TypeReferenceNode {
-    const file: string = name.split(".")[0]!;
-    this.dtos_.add(file);
-    return factory.createTypeReferenceNode(
-      namespace?.length
-        ? factory.createQualifiedName(
-            factory.createIdentifier(namespace),
-            factory.createIdentifier(file),
-          )
-        : name,
-    );
-  }
-
-  public tag(type: string, arg?: any): ts.TypeReferenceNode {
-    const instance: string = this.external({
-      type: "instance",
-      library: "typia",
-      name: "tags",
-    });
-    return factory.createTypeReferenceNode(
-      `${instance}.${type}`,
-      arg === undefined ? [] : [TypeLiteralFactory.generate(arg)],
-    );
-  }
-
-  public toStatements(
-    dtoPath: (name: string) => string,
-    current?: string,
-  ): ts.Statement[] {
-    return [
-      ...[...this.external_.entries()].map(([library, props]) =>
-        factory.createImportDeclaration(
-          undefined,
-          factory.createImportClause(
-            false,
-            props.default !== null
-              ? factory.createIdentifier(props.default)
-              : undefined,
-            props.instances.size
-              ? factory.createNamedImports(
-                  [...props.instances].map((i) =>
-                    factory.createImportSpecifier(
-                      false,
-                      undefined,
-                      factory.createIdentifier(i),
-                    ),
-                  ),
-                )
-              : undefined,
-          ),
-          factory.createStringLiteral(library),
-        ),
-      ),
-      ...(this.external_.size && this.dtos_.size
-        ? [FilePrinter.newLine()]
-        : []),
-      ...[...this.dtos_]
-        .filter(
-          current ? (name) => name !== current!.split(".")[0] : () => true,
-        )
-        .map((i) =>
-          factory.createImportDeclaration(
-            undefined,
-            factory.createImportClause(
-              false,
-              undefined,
-              factory.createNamedImports([
-                factory.createImportSpecifier(
-                  false,
-                  undefined,
-                  factory.createIdentifier(i),
-                ),
-              ]),
-            ),
-            factory.createStringLiteral(dtoPath(i)),
-          ),
-        ),
-    ];
-  }
-}
-export namespace MigrateImportProgrammer {
-  export interface IProps {
-    type: "default" | "instance";
-    library: string;
-    name: string;
-  }
-}
-interface IClause {
-  default: string | null;
-  instances: Set<string>;
-}
+import { factory } from "@ttsc/factory";
+
+import { TypeLiteralFactory } from "../factories/TypeLiteralFactory";
+import ts from "../internal/ts";
+import { FilePrinter } from "../utils/FilePrinter";
+import { MapUtil } from "../utils/MapUtil";
+
+export class NestiaMigrateImportProgrammer {
+  private external_: Map<string, IClause> = new Map();
+  private dtos_: Set<string> = new Set();
+
+  public constructor() {}
+
+  public empty(): boolean {
+    return this.external_.size === 0 && this.dtos_.size === 0;
+  }
+
+  public external(props: MigrateImportProgrammer.IProps): string {
+    const clause: IClause = MapUtil.take(this.external_)(props.library)(() => ({
+      default: null,
+      instances: new Set(),
+    }));
+    const name: string = props.name.split(".")[0]!;
+    if (props.type === "default") clause.default = props.name;
+    else clause.instances.add(name);
+    return name;
+  }
+
+  public dto(name: string, namespace?: string): ts.TypeReferenceNode {
+    const file: string = name.split(".")[0]!;
+    this.dtos_.add(file);
+    return factory.createTypeReferenceNode(
+      namespace?.length
+        ? factory.createQualifiedName(
+            factory.createIdentifier(namespace),
+            factory.createIdentifier(file),
+          )
+        : name,
+    );
+  }
+
+  public tag(type: string, arg?: any): ts.TypeReferenceNode {
+    const instance: string = this.external({
+      type: "instance",
+      library: "typia",
+      name: "tags",
+    });
+    return factory.createTypeReferenceNode(
+      `${instance}.${type}`,
+      arg === undefined ? [] : [TypeLiteralFactory.generate(arg)],
+    );
+  }
+
+  public toStatements(
+    dtoPath: (name: string) => string,
+    current?: string,
+  ): ts.Statement[] {
+    // Group the DTO references by their resolved module specifier: relative
+    // specifiers stay one-import-per-file, while package specifiers (e.g. the
+    // monorepo's `@ORGANIZATION/PROJECT-api`) merge into a single clause.
+    const modules: Map<string, string[]> = new Map();
+    for (const name of this.dtos_)
+      if (current === undefined || name !== current.split(".")[0])
+        MapUtil.take(modules)(dtoPath(name))(() => []).push(name);
+    return [
+      ...[...this.external_.entries()].map(([library, props]) =>
+        factory.createImportDeclaration(
+          undefined,
+          factory.createImportClause(
+            false,
+            props.default !== null
+              ? factory.createIdentifier(props.default)
+              : undefined,
+            props.instances.size
+              ? factory.createNamedImports(
+                  [...props.instances].map((i) =>
+                    factory.createImportSpecifier(
+                      false,
+                      undefined,
+                      factory.createIdentifier(i),
+                    ),
+                  ),
+                )
+              : undefined,
+          ),
+          factory.createStringLiteral(library),
+        ),
+      ),
+      ...(this.external_.size && this.dtos_.size
+        ? [FilePrinter.newLine()]
+        : []),
+      ...[...modules.entries()].map(([specifier, names]) =>
+        factory.createImportDeclaration(
+          undefined,
+          // DTO files declare pure types, and generated code references them
+          // only in type positions — keep the clause type-only so emitted
+          // JS never loads the DTO module at runtime.
+          factory.createImportClause(
+            true,
+            undefined,
+            factory.createNamedImports(
+              names.map((name) =>
+                factory.createImportSpecifier(
+                  false,
+                  undefined,
+                  factory.createIdentifier(name),
+                ),
+              ),
+            ),
+          ),
+          factory.createStringLiteral(specifier),
+        ),
+      ),
+    ];
+  }
+}
+export namespace MigrateImportProgrammer {
+  export interface IProps {
+    type: "default" | "instance";
+    library: string;
+    name: string;
+  }
+}
+interface IClause {
+  default: string | null;
+  instances: Set<string>;
+}