fix: resolve seeder/factory file patterns & paths relative to root di…

…rectory
tada5hi · Jul 22, 2023 · 622aec9 · 622aec9
1 parent 8bb0ec5
commit 622aec9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/seeder/executor.ts b/src/seeder/executor.ts
@@ -37,10 +37,13 @@ export class SeederExecutor {
         }
 
         if (options.factories) {
-            await prepareSeederFactories(options.factories);
+            await prepareSeederFactories(options.factories, this.options.root);
         }
 
-        const seederElements = await prepareSeederSeeds(options.seeds);
+        const seederElements = await prepareSeederSeeds(
+            options.seeds,
+            this.options.root,
+        );
 
         const existing = await this.loadExisting(queryRunner);
         const all = await this.buildEntities(seederElements);

diff --git a/src/seeder/factory/utils.ts b/src/seeder/factory/utils.ts
@@ -33,6 +33,7 @@ export function useSeederFactory<O extends Record<string, any>>(
 
 export async function prepareSeederFactories(
     items: SeederFactoryItem[] | string[],
+    root?: string,
 ) {
     let factoryFiles: string[] = [];
     const factoryConfigs: SeederFactoryItem[] = [];
@@ -47,8 +48,8 @@ export async function prepareSeederFactories(
     }
 
     if (factoryFiles.length > 0) {
-        factoryFiles = await resolveFilePatterns(factoryFiles);
-        factoryFiles = resolveFilePaths(factoryFiles);
+        factoryFiles = await resolveFilePatterns(factoryFiles, root);
+        factoryFiles = resolveFilePaths(factoryFiles, root);
 
         for (let i = 0; i < factoryFiles.length; i++) {
             await load(factoryFiles[i]);

diff --git a/src/seeder/utils/prepare.ts b/src/seeder/utils/prepare.ts
@@ -5,6 +5,7 @@ import { resolveFilePaths, resolveFilePatterns } from './file-path';
 
 export async function prepareSeederSeeds(
     input: SeederConstructor[] | string[],
+    root?: string,
 ): Promise<SeederPrepareElement[]> {
     const items: SeederPrepareElement[] = [];
 
@@ -21,8 +22,8 @@ export async function prepareSeederSeeds(
     }
 
     if (seedFiles.length > 0) {
-        seedFiles = await resolveFilePatterns(seedFiles);
-        seedFiles = resolveFilePaths(seedFiles);
+        seedFiles = await resolveFilePatterns(seedFiles, root);
+        seedFiles = resolveFilePaths(seedFiles, root);
 
         for (let i = 0; i < seedFiles.length; i++) {
             const moduleExports = await load(seedFiles[i]);