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

package/src/programmers/NestiaMigrateNestModuleProgrammer.ts

@@ -1,64 +1,64 @@
-import { SyntaxKind, factory } from "@ttsc/factory";
-
-import ts from "../internal/ts";
-import { INestiaMigrateController } from "../structures/INestiaMigrateController";
-import { FilePrinter } from "../utils/FilePrinter";
-
-export namespace NestiaMigrateNestModuleProgrammer {
-  export const write = (
-    controllers: INestiaMigrateController[],
-  ): ts.Statement[] => [
-    $import("@nestjs/common")("Module"),
-    ...(controllers.length ? [FilePrinter.newLine()] : []),
-    ...controllers.map((c) =>
-      $import(`${c.location.replace("src/", "./")}/${c.name}`)(c.name),
-    ),
-    ...(controllers.length ? [FilePrinter.newLine()] : []),
-    factory.createClassDeclaration(
-      [
-        factory.createDecorator(
-          factory.createCallExpression(
-            factory.createIdentifier("Module"),
-            undefined,
-            [
-              factory.createObjectLiteralExpression(
-                [
-                  factory.createPropertyAssignment(
-                    factory.createIdentifier("controllers"),
-                    factory.createArrayLiteralExpression(
-                      controllers.map((c) => factory.createIdentifier(c.name)),
-                      true,
-                    ),
-                  ),
-                ],
-                true,
-              ),
-            ],
-          ),
-        ),
-        factory.createToken(SyntaxKind.ExportKeyword),
-      ],
-      "MyModule",
-      undefined,
-      undefined,
-      [],
-    ),
-  ];
-}
-
-const $import = (file: string) => (instance: string) =>
-  factory.createImportDeclaration(
-    undefined,
-    factory.createImportClause(
-      false,
-      undefined,
-      factory.createNamedImports([
-        factory.createImportSpecifier(
-          false,
-          undefined,
-          factory.createIdentifier(instance),
-        ),
-      ]),
-    ),
-    factory.createStringLiteral(file),
-  );
+import { SyntaxKind, factory } from "@ttsc/factory";
+
+import ts from "../internal/ts";
+import { INestiaMigrateController } from "../structures/INestiaMigrateController";
+import { FilePrinter } from "../utils/FilePrinter";
+
+export namespace NestiaMigrateNestModuleProgrammer {
+  export const write = (
+    controllers: INestiaMigrateController[],
+  ): ts.Statement[] => [
+    $import("@nestjs/common")("Module"),
+    ...(controllers.length ? [FilePrinter.newLine()] : []),
+    ...controllers.map((c) =>
+      $import(`${c.location.replace("src/", "./")}/${c.name}`)(c.name),
+    ),
+    ...(controllers.length ? [FilePrinter.newLine()] : []),
+    factory.createClassDeclaration(
+      [
+        factory.createDecorator(
+          factory.createCallExpression(
+            factory.createIdentifier("Module"),
+            undefined,
+            [
+              factory.createObjectLiteralExpression(
+                [
+                  factory.createPropertyAssignment(
+                    factory.createIdentifier("controllers"),
+                    factory.createArrayLiteralExpression(
+                      controllers.map((c) => factory.createIdentifier(c.name)),
+                      true,
+                    ),
+                  ),
+                ],
+                true,
+              ),
+            ],
+          ),
+        ),
+        factory.createToken(SyntaxKind.ExportKeyword),
+      ],
+      "MyModule",
+      undefined,
+      undefined,
+      [],
+    ),
+  ];
+}
+
+const $import = (file: string) => (instance: string) =>
+  factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(
+      false,
+      undefined,
+      factory.createNamedImports([
+        factory.createImportSpecifier(
+          false,
+          undefined,
+          factory.createIdentifier(instance),
+        ),
+      ]),
+    ),
+    factory.createStringLiteral(file),
+  );

package/src/programmers/NestiaMigrateNestProgrammer.ts

@@ -1,89 +1,110 @@
-import { NodeFlags, SyntaxKind, factory } from "@ttsc/factory";
-
-import { NestiaMigrateControllerAnalyzer } from "../analyzers/NestiaMigrateControllerAnalyzer";
-import ts from "../internal/ts";
-import { INestiaMigrateContext } from "../structures/INestiaMigrateContext";
-import { INestiaMigrateController } from "../structures/INestiaMigrateController";
-import { FilePrinter } from "../utils/FilePrinter";
-import { NestiaMigrateDtoProgrammer } from "./NestiaMigrateDtoProgrammer";
-import { NestiaMigrateImportProgrammer } from "./NestiaMigrateImportProgrammer";
-import { NestiaMigrateNestControllerProgrammer } from "./NestiaMigrateNestControllerProgrammer";
-import { NestiaMigrateNestModuleProgrammer } from "./NestiaMigrateNestModuleProgrammer";
-
-export namespace NestiaMigrateNestProgrammer {
-  export const write = (
-    context: INestiaMigrateContext,
-  ): Record<string, string> => {
-    const controllers: INestiaMigrateController[] =
-      NestiaMigrateControllerAnalyzer.analyze(context.application.routes);
-    const statements: [string, ts.Statement[]][] = [
-      ["src/MyModule.ts", NestiaMigrateNestModuleProgrammer.write(controllers)],
-      ...controllers.map(
-        (c) =>
-          [
-            `${c.location}/${c.name}.ts`,
-            NestiaMigrateNestControllerProgrammer.write({
-              config: context.config,
-              components: context.application.document().components,
-              controller: c,
-            }),
-          ] satisfies [string, ts.Statement[]],
-      ),
-      ...[
-        ...NestiaMigrateDtoProgrammer.compose({
-          config: context.config,
-          components: context.application.document().components,
-        }).entries(),
-      ].map(
-        ([key, value]) =>
-          [`src/api/structures/${key}.ts`, writeDtoFile(key, value)] satisfies [
-            string,
-            ts.Statement[],
-          ],
-      ),
-    ];
-    return Object.fromEntries(
-      statements.map(([key, value]) => [
-        key,
-        FilePrinter.write({ statements: value }),
-      ]),
-    );
-  };
-
-  const writeDtoFile = (
-    key: string,
-    modulo: NestiaMigrateDtoProgrammer.IModule,
-  ): ts.Statement[] => {
-    const importer = new NestiaMigrateImportProgrammer();
-    const statements: ts.Statement[] = iterate(importer)(modulo);
-    if (statements.length === 0) return [];
-
-    return [
-      ...importer.toStatements((name) => `./${name}`, key),
-      ...(importer.empty() ? [] : [FilePrinter.newLine()]),
-      ...statements,
-    ];
-  };
-
-  const iterate =
-    (importer: NestiaMigrateImportProgrammer) =>
-    (modulo: NestiaMigrateDtoProgrammer.IModule): ts.Statement[] => {
-      const output: ts.Statement[] = [];
-      if (modulo.programmer !== null) output.push(modulo.programmer(importer));
-      if (modulo.children.size) {
-        const internal: ts.Statement[] = [];
-        for (const child of modulo.children.values())
-          internal.push(...iterate(importer)(child));
-        output.push(
-          factory.createModuleDeclaration(
-            [factory.createModifier(SyntaxKind.ExportKeyword)],
-            factory.createIdentifier(modulo.name),
-            factory.createModuleBlock(internal),
-            NodeFlags.Namespace,
-          ),
-        );
-      }
-      output.push(FilePrinter.newLine());
-      return output;
-    };
-}
+import { NodeFlags, SyntaxKind, factory } from "@ttsc/factory";
+
+import { NestiaMigrateControllerAnalyzer } from "../analyzers/NestiaMigrateControllerAnalyzer";
+import ts from "../internal/ts";
+import { INestiaMigrateContext } from "../structures/INestiaMigrateContext";
+import { INestiaMigrateController } from "../structures/INestiaMigrateController";
+import { FilePrinter } from "../utils/FilePrinter";
+import { NestiaMigrateDtoProgrammer } from "./NestiaMigrateDtoProgrammer";
+import { NestiaMigrateImportProgrammer } from "./NestiaMigrateImportProgrammer";
+import { NestiaMigrateNestControllerProgrammer } from "./NestiaMigrateNestControllerProgrammer";
+import { NestiaMigrateNestModuleProgrammer } from "./NestiaMigrateNestModuleProgrammer";
+
+export namespace NestiaMigrateNestProgrammer {
+  export const write = (
+    context: INestiaMigrateContext,
+  ): Record<string, string> => {
+    const controllers: INestiaMigrateController[] =
+      NestiaMigrateControllerAnalyzer.analyze(context.application.routes);
+    const statements: [string, ts.Statement[]][] = [
+      [
+        "packages/backend/src/MyModule.ts",
+        NestiaMigrateNestModuleProgrammer.write(controllers),
+      ],
+      ...controllers.map(
+        (c) =>
+          [
+            `packages/backend/${c.location}/${c.name}.ts`,
+            NestiaMigrateNestControllerProgrammer.write({
+              config: context.config,
+              components: context.application.document().components,
+              controller: c,
+            }),
+          ] satisfies [string, ts.Statement[]],
+      ),
+      ...[
+        ...NestiaMigrateDtoProgrammer.compose({
+          config: context.config,
+          components: context.application.document().components,
+        }).entries(),
+      ].map(
+        ([key, value]) =>
+          [
+            `packages/api/src/structures/${key}.ts`,
+            writeDtoFile(key, value),
+          ] satisfies [string, ts.Statement[]],
+      ),
+    ];
+    const files: Record<string, string> = Object.fromEntries(
+      statements.map(([key, value]) => [
+        key,
+        FilePrinter.write({ statements: value }),
+      ]),
+    );
+    // The template's `packages/api/src/module.ts` re-exports the DTO types
+    // through `export * from "./structures"`, so the generated structure files
+    // need a barrel replacing the one deleted from the bundled template.
+    files["packages/api/src/structures/index.ts"] = writeDtoBarrel(files);
+    return files;
+  };
+
+  const writeDtoBarrel = (files: Record<string, string>): string => {
+    const prefix: string = "packages/api/src/structures/";
+    const names: string[] = Object.entries(files)
+      .filter(
+        ([key, content]) =>
+          key.startsWith(prefix) && key.endsWith(".ts") && content.length !== 0,
+      )
+      .map(([key]) => key.slice(prefix.length, -".ts".length))
+      .sort();
+    if (names.length === 0) return "export {};\n";
+    return names.map((name) => `export * from "./${name}";\n`).join("");
+  };
+
+  const writeDtoFile = (
+    key: string,
+    modulo: NestiaMigrateDtoProgrammer.IModule,
+  ): ts.Statement[] => {
+    const importer = new NestiaMigrateImportProgrammer();
+    const statements: ts.Statement[] = iterate(importer)(modulo);
+    if (statements.length === 0) return [];
+
+    return [
+      ...importer.toStatements((name) => `./${name}`, key),
+      ...(importer.empty() ? [] : [FilePrinter.newLine()]),
+      ...statements,
+    ];
+  };
+
+  const iterate =
+    (importer: NestiaMigrateImportProgrammer) =>
+    (modulo: NestiaMigrateDtoProgrammer.IModule): ts.Statement[] => {
+      const output: ts.Statement[] = [];
+      if (modulo.programmer !== null) output.push(modulo.programmer(importer));
+      if (modulo.children.size) {
+        const internal: ts.Statement[] = [];
+        for (const child of modulo.children.values())
+          internal.push(...iterate(importer)(child));
+        output.push(
+          factory.createModuleDeclaration(
+            [factory.createModifier(SyntaxKind.ExportKeyword)],
+            factory.createIdentifier(modulo.name),
+            factory.createModuleBlock(internal),
+            NodeFlags.Namespace,
+          ),
+        );
+      }
+      output.push(FilePrinter.newLine());
+      return output;
+    };
+}