Skip to content

Commit

Permalink
fix: set seeder to synchronous execution by default
Browse files Browse the repository at this point in the history
  • Loading branch information
tada5hi committed Oct 3, 2022
1 parent 9e44432 commit 955f2ef
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 23 deletions.
1 change: 0 additions & 1 deletion src/data-source/find/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './module';
export * from './type';
export * from './utils';
8 changes: 4 additions & 4 deletions src/data-source/find/module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { removeFileNameExtension } from 'locter/dist/utils';
import path from 'path';
import { DataSource, InstanceChecker } from 'typeorm';
import { loadScriptFile, locateFile } from 'locter';
import { DataSourceFindOptions } from './type';
import { isTsNodeRuntimeEnvironment } from '../../utils';
import { readTsConfig } from '../../utils/tsconfig';
import { changeTSToJSPath } from '../options';
import {removeFileExtension} from "./utils";

export async function findDataSource(
context?: DataSourceFindOptions,
Expand All @@ -17,12 +17,12 @@ export async function findDataSource(
context = context || {};

if (context.fileName) {
context.fileName = removeFileExtension(
context.fileName = removeFileNameExtension(
context.fileName,
['.js', '.ts', '.mjs', '.cjs']
['.js', '.ts', '.mjs', '.cjs'],
);

if(context.fileName !== 'data-source') {
if (context.fileName !== 'data-source') {
fileNames.unshift(context.fileName);
}
}
Expand Down
15 changes: 0 additions & 15 deletions src/data-source/find/utils.ts

This file was deleted.

13 changes: 11 additions & 2 deletions src/seeder/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,23 @@ export async function runSeeders(

const items = await prepareSeeder(options);
const promises : Promise<unknown>[] = [];
const results : unknown[] = [];

for (let i = 0; i < items.length; i++) {
const promise = runSeeder(dataSource, items[i], {
factoriesLoad: false,
});

promises.push(promise);
if (options.parallelExecution) {
promises.push(promise);
} else {
await promise;
}
}

if (promises.length > 0) {
return Promise.all(promises);
}

return Promise.all(promises);
return results;
}
4 changes: 3 additions & 1 deletion src/seeder/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@ export type SeederOptions = {
seedName?: string,

factories?: SeederFactoryConfig[] | string[],
factoriesLoad?: boolean
factoriesLoad?: boolean,

parallelExecution?: boolean
};

0 comments on commit 955f2ef

Please sign in to comment.