Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/seeders/source.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ export class SeedersSource {
* paths are resolved from the project root
*/
private async getDirectoryFiles(directoryPath: string): Promise<FileNode<unknown>[]> {
const { files } = await sourceFiles(this.app.appRoot, directoryPath, false)
const { files } = await sourceFiles(
this.app.appRoot,
directoryPath,
this.config.seeders?.naturalSort || false
)
return files
}

Expand Down
3 changes: 2 additions & 1 deletion src/types/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ export type MigratorConfig = {
* Seeders config
*/
export type SeedersConfig = {
paths: string[]
paths?: string[]
naturalSort?: boolean
}

/**
Expand Down
55 changes: 55 additions & 0 deletions test/seeders/seeders_source.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,59 @@ test.group('Seeds Source', (group) => {
]
)
})

test('use a natural sort to order files when configured', async ({ fs, assert }) => {
const app = new AppFactory().create(fs.baseUrl, () => {})
await app.init()
const db = getDb()

const config = Object.assign({}, db.getRawConnection('primary')!.config, {
seeders: {
naturalSort: true,
paths: ['database/seeders'],
},
})

const seedersSource = new SeedersSource(config, app)
await fs.create('database/seeders/1.ts', '')
await fs.create('database/seeders/2.ts', '')
await fs.create('database/seeders/10.ts', '')
await fs.create('database/seeders/3.ts', '')
await fs.create('database/seeders/100.ts', '')
await fs.create('database/seeders/4.ts', '')
await db.manager.closeAll()

const files = await seedersSource.getSeeders()
assert.deepEqual(
files.map((file) => {
return { absPath: file.absPath, name: file.name }
}),
[
{
absPath: join(fs.basePath, 'database/seeders/1.ts'),
name: 'database/seeders/1',
},
{
absPath: join(fs.basePath, 'database/seeders/2.ts'),
name: 'database/seeders/2',
},
{
absPath: join(fs.basePath, 'database/seeders/3.ts'),
name: 'database/seeders/3',
},
{
absPath: join(fs.basePath, 'database/seeders/4.ts'),
name: 'database/seeders/4',
},
{
absPath: join(fs.basePath, 'database/seeders/10.ts'),
name: 'database/seeders/10',
},
{
absPath: join(fs.basePath, 'database/seeders/100.ts'),
name: 'database/seeders/100',
},
]
)
})
})