fix: load seeders classes using typeorm (jorgebodega#324)

Author: alumni

package.json

@@ -3,13 +3,10 @@
 	"bin": {
 		"typeorm-seeding": "dist/cli.js"
 	},
-	"contributors": [
-		"Jorge Bodega <[email protected]> (https://github.com/jorgebodega)"
-	],
+	"contributors": ["Jorge Bodega <[email protected]> (https://github.com/jorgebodega)"],
 	"dependencies": {
 		"chalk": "4.1.2",
 		"commander": "12.1.0",
-		"glob": "10.4.2",
 		"ora": "5.4.1",
 		"tslib": "2.6.3"
 	},
@@ -32,12 +29,7 @@
 	"engines": {
 		"node": ">=18 <19 || >=20"
 	},
-	"keywords": [
-		"typeorm",
-		"seed",
-		"seeding",
-		"orm"
-	],
+	"keywords": ["typeorm", "seed", "seeding", "orm"],
 	"license": "MIT",
 	"main": "dist/index.js",
 	"name": "@jorgebodega/typeorm-seeding",

pnpm-lock.yaml

@@ -8,7 +8,7 @@ import { SeederExecutionError } from "../errors/SeederExecutionError";
 import { useDataSource, useSeeders } from "../helpers";
 import type { Seeder } from "../seeder";
 import type { Constructable, SeedCommandArguments } from "../types";
-import { calculateFilePath, loadDataSource, loadSeeders } from "../utils";
+import { loadDataSource, loadSeeders } from "../utils";
 
 async function run(paths: string[]) {
 	const opts = seedCommand.opts<SeedCommandArguments>();
@@ -32,9 +32,7 @@ async function run(paths: string[]) {
 	spinner.start("Importing seeders");
 	let seeders!: Constructable<Seeder>[];
 	try {
-		const seederFiles = paths.flatMap(calculateFilePath);
-
-		seeders = await loadSeeders(seederFiles);
+		seeders = await loadSeeders(dataSource, paths);
 
 		spinner.succeed("Seeder imported");
 	} catch (error: unknown) {

src/commands/seed.command.ts

@@ -1,4 +1,5 @@
 import type { DataSource } from "typeorm";
+import { importClassesFromDirectories } from "typeorm/util/DirectoryExportedClassesLoader";
 import { CommandUtils as TypeormCommandUtils } from "typeorm/commands/CommandUtils";
 import { Seeder } from "../seeder";
 import type { Constructable } from "../types";
@@ -7,22 +8,13 @@ export async function loadDataSource(dataSourceFilePath: string): Promise<DataSo
 	return TypeormCommandUtils.loadDataSource(dataSourceFilePath);
 }
 
-export async function loadSeeders(seederPaths: string[]): Promise<Constructable<Seeder>[]> {
-	const seederFileExports = (await Promise.all(seederPaths.map((seederFile) => import(seederFile))))
-		.map((seederExport) => seederExport.default?.default ?? seederExport.default)
-		.filter((seederExport) => Boolean(seederExport));
+export async function loadSeeders(dataSource: DataSource, seederPaths: string[]): Promise<Constructable<Seeder>[]> {
+	const seederFileExports = await importClassesFromDirectories(dataSource.logger, seederPaths);
 
-	if (seederFileExports.length === 0) {
-		throw new Error("No default seeders found");
-	}
+	const seeders = seederFileExports.filter((seeder) => seeder.prototype instanceof Seeder) as Constructable<Seeder>[];
 
-	const seeders: Constructable<Seeder>[] = [];
-	for (const fileExport in seederFileExports) {
-		const seederExport = seederFileExports[fileExport];
-		const instance = new seederExport();
-		if (instance instanceof Seeder) {
-			seeders.push(seederExport);
-		}
+	if (seeders.length === 0) {
+		throw new Error("No default seeders found");
 	}
 
 	return seeders;

src/utils/commandUtils.ts

@@ -1,2 +1 @@
 export * from "./commandUtils";
-export * from "./fileHandling";