fix(cli): sort migrations lexicographically for real

This commit is contained in:
Joakim Carlstein 2024-01-22 13:39:38 +01:00 committed by Joakim Carlstein
parent bddb2d6b14
commit 121492b303
3 changed files with 144 additions and 11 deletions

View file

@ -0,0 +1,134 @@
import fs from 'node:fs/promises';
import { afterEach, beforeEach, describe, it, mock } from 'node:test';
import assert from 'node:assert';
import { getMigrations } from './get-migrations.js';
const originalReaddir = fs.readdir;
const readdirMock = mock.fn(originalReaddir);
describe('get-migrations', () => {
beforeEach(() => {
fs.readdir = readdirMock;
});
afterEach(() => {
readdirMock.mock.restore();
fs.readdir = originalReaddir;
});
it('should skip files with leading periods', async () => {
readdirMock.mock.mockImplementation(async () => ['.foo.js', 'bar.js', 'baz.js']);
const migrations = await getMigrations('/cwd/', 'directory');
assert.deepStrictEqual(migrations, [
{
name: 'bar.js',
filePath: '/cwd/directory/bar.js',
relativeFilePath: 'directory/bar.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
{
name: 'baz.js',
filePath: '/cwd/directory/baz.js',
relativeFilePath: 'directory/baz.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
]);
});
it('should skip files with leading underscores', async () => {
readdirMock.mock.mockImplementation(async () => ['_foo.js', 'bar.js', 'baz.js']);
const migrations = await getMigrations('/cwd/', 'directory');
assert.deepStrictEqual(migrations, [
{
name: 'bar.js',
filePath: '/cwd/directory/bar.js',
relativeFilePath: 'directory/bar.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
{
name: 'baz.js',
filePath: '/cwd/directory/baz.js',
relativeFilePath: 'directory/baz.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
]);
});
it('should skip files without file extensions', async () => {
readdirMock.mock.mockImplementation(async () => ['foo', 'bar.js', 'baz.js']);
const migrations = await getMigrations('/cwd/', 'directory');
assert.deepStrictEqual(migrations, [
{
name: 'bar.js',
filePath: '/cwd/directory/bar.js',
relativeFilePath: 'directory/bar.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
{
name: 'baz.js',
filePath: '/cwd/directory/baz.js',
relativeFilePath: 'directory/baz.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
]);
});
it('should sort them in lexicographical order', async () => {
readdirMock.mock.mockImplementation(async () => ['foo.js', 'bar_data.js', 'bar.js', 'baz.js']);
const migrations = await getMigrations('/cwd/', 'directory');
assert.deepStrictEqual(migrations, [
{
name: 'bar.js',
filePath: '/cwd/directory/bar.js',
relativeFilePath: 'directory/bar.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
{
name: 'bar_data.js',
filePath: '/cwd/directory/bar_data.js',
relativeFilePath: 'directory/bar_data.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
{
name: 'baz.js',
filePath: '/cwd/directory/baz.js',
relativeFilePath: 'directory/baz.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
{
name: 'foo.js',
filePath: '/cwd/directory/foo.js',
relativeFilePath: 'directory/foo.js',
extension: '.js',
directory: 'directory',
cwd: '/cwd/',
},
]);
});
});

View file

@ -1,17 +1,14 @@
import path from 'node:path';
import fs from 'node:fs/promises';
import { type Dirent } from 'node:fs';
import { type MigrationMetadata } from '@emigrate/types';
import { withLeadingPeriod } from './with-leading-period.js';
import { BadOptionError } from './errors.js';
export type GetMigrationsFunction = typeof getMigrations;
const tryReadDirectory = async (directoryPath: string): Promise<Dirent[]> => {
const tryReadDirectory = async (directoryPath: string): Promise<string[]> => {
try {
return await fs.readdir(directoryPath, {
withFileTypes: true,
});
return await fs.readdir(directoryPath);
} catch {
throw BadOptionError.fromOption('directory', `Couldn't read directory: ${directoryPath}`);
}
@ -23,12 +20,9 @@ export const getMigrations = async (cwd: string, directory: string): Promise<Mig
const allFilesInMigrationDirectory = await tryReadDirectory(directoryPath);
const migrationFiles: MigrationMetadata[] = allFilesInMigrationDirectory
.filter(
(file) =>
file.isFile() && !file.name.startsWith('.') && !file.name.startsWith('_') && path.extname(file.name) !== '',
)
.sort((a, b) => a.name.localeCompare(b.name))
.map(({ name }) => {
.filter((name) => !name.startsWith('.') && !name.startsWith('_') && path.extname(name) !== '')
.sort()
.map((name) => {
const filePath = path.join(directoryPath, name);
return {