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
3,684 changes: 559 additions & 3,125 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions packages/core/jest.config.js

This file was deleted.

11 changes: 6 additions & 5 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"scripts": {
"build": "tsc",
"tsc:publish": "tsc && npm publish",
"test": "jest"
"test": "vitest run",
"test:watch": "vitest"
},
"publishConfig": {
"access": "public"
Expand All @@ -24,17 +25,17 @@
},
"devDependencies": {
"@nestjs/testing": "^10.4.1",
"@types/jest": "^29.5.13",
"@swc/core": "^1.7.42",
"@types/node": "^20.16.5",
"@typescript-eslint/eslint-plugin": "^8.5.0",
"@typescript-eslint/parser": "^8.5.0",
"eslint": "^9.10.0",
"eslint-config-prettier": "^9.1.0",
"jest": "^29.7.0",
"prettier": "^3.3.3",
"rxjs": "^7.8.1",
"ts-jest": "^29.2.5",
"typescript": "^5.6.2"
"typescript": "^5.6.2",
"unplugin-swc": "^1.5.1",
"vitest": "^2.1.1"
},
"gitHead": "010c167e60c596cb1aabf28186242a095c351e59"
}
27 changes: 14 additions & 13 deletions packages/core/src/test/unit/inbox-outbox-event-processor.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { vi } from 'vitest';
import { DatabaseDriverFactory } from "../../driver/database-driver.factory";
import { DatabaseDriver } from "../../driver/database.driver";
import { InboxOutboxModuleOptions } from "../../inbox-outbox.module-definition";
Expand Down Expand Up @@ -28,11 +29,11 @@ describe('InboxOutboxEventProcessor', () => {
mockedInboxOutboxEventProcessor = createMockedInboxOutboxEventProcessor();
mockedEventConfigurationResolver = createMockedEventConfigurationResolver();
mockLogger = {
error: jest.fn(),
log: jest.fn(),
warn: jest.fn(),
debug: jest.fn(),
info: jest.fn(),
error: vi.fn(),
log: vi.fn(),
warn: vi.fn(),
debug: vi.fn(),
info: vi.fn(),
};
});

Expand All @@ -50,13 +51,13 @@ describe('InboxOutboxEventProcessor', () => {
];

const firstListener : IListener<any> = {
handle: jest.fn().mockReturnValue({}),
getName: jest.fn().mockReturnValue('listener'),
handle: vi.fn().mockReturnValue({}),
getName: vi.fn().mockReturnValue('listener'),
};

const secondListener : IListener<any> = {
handle: jest.fn().mockReturnValue({}),
getName: jest.fn().mockReturnValue('listener'),
handle: vi.fn().mockReturnValue({}),
getName: vi.fn().mockReturnValue('listener'),
};


Expand Down Expand Up @@ -98,13 +99,13 @@ describe('InboxOutboxEventProcessor', () => {
];

const firstListener : IListener<any> = {
handle: jest.fn().mockReturnValue({}),
getName: jest.fn().mockReturnValue('listener'),
handle: vi.fn().mockReturnValue({}),
getName: vi.fn().mockReturnValue('listener'),
};

const secondListener : IListener<any> = {
handle: jest.fn().mockRejectedValue({}),
getName: jest.fn().mockReturnValue('listener'),
handle: vi.fn().mockRejectedValue({}),
getName: vi.fn().mockReturnValue('listener'),
};


Expand Down
12 changes: 7 additions & 5 deletions packages/core/src/test/unit/mock/driver.mock.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { vi } from 'vitest';

export const createMockedDriver = () => {
return {
persist: jest.fn(),
remove: jest.fn(),
flush: jest.fn(),
createInboxOutboxTransportEvent: jest.fn(),
findAndExtendReadyToRetryEvents: jest.fn()
persist: vi.fn(),
remove: vi.fn(),
flush: vi.fn(),
createInboxOutboxTransportEvent: vi.fn(),
findAndExtendReadyToRetryEvents: vi.fn()
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { vi } from 'vitest';

export const createMockedEventConfigurationResolver = () => {
return {
resolve: jest.fn(),
resolve: vi.fn(),
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { vi } from 'vitest';

export const createMockedInboxOutboxEventProcessor = () => {
return {
process: jest.fn(),
process: vi.fn(),
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { vi, Mock } from 'vitest';
import { Logger } from '@nestjs/common';
import { DatabaseDriverFactory } from '../../driver/database-driver.factory';
import { DatabaseDriver } from '../../driver/database.driver';
Expand All @@ -20,7 +21,7 @@ describe('RetryableInboxOutboxEventPoller', () => {
let mockInboxOutboxEventProcessor: InboxOutboxEventProcessorContract;

beforeEach(() => {
jest.useFakeTimers();
vi.useFakeTimers();
mockedDriver = createMockedDriver();
mockedDriverFactory = createMockedDriverFactory(mockedDriver);
inboxOutboxOptions = createMockedInboxOutboxOptionsFactory(mockedDriverFactory, [
Expand All @@ -34,25 +35,25 @@ describe('RetryableInboxOutboxEventPoller', () => {
},
]);
mockLogger = {
log: jest.fn(),
error: jest.fn(),
warn: jest.fn(),
debug: jest.fn(),
log: vi.fn(),
error: vi.fn(),
warn: vi.fn(),
debug: vi.fn(),
} as unknown as Logger;

mockTransactionalEventEmitter = {
getListeners: jest.fn().mockReturnValue([]),
getListeners: vi.fn().mockReturnValue([]),
} as unknown as TransactionalEventEmitter;

mockEventConfigurationResolver = {} as EventConfigurationResolver;

mockInboxOutboxEventProcessor = {
process: jest.fn().mockResolvedValue(undefined),
process: vi.fn().mockResolvedValue(undefined),
};
});

afterEach(() => {
jest.useRealTimers();
vi.useRealTimers();
});

function createPoller() {
Expand All @@ -78,21 +79,21 @@ describe('RetryableInboxOutboxEventPoller', () => {
});

it('should stop polling after shutdown is initiated', async () => {
(mockedDriver.findAndExtendReadyToRetryEvents as jest.Mock).mockResolvedValue([]);
(mockedDriver.findAndExtendReadyToRetryEvents as Mock).mockResolvedValue([]);
const poller = createPoller();
await poller.onModuleInit();

jest.advanceTimersByTime(inboxOutboxOptions.retryEveryMilliseconds);
vi.advanceTimersByTime(inboxOutboxOptions.retryEveryMilliseconds);
await Promise.resolve();

const callCountBeforeShutdown = (mockedDriver.findAndExtendReadyToRetryEvents as jest.Mock).mock.calls.length;
const callCountBeforeShutdown = (mockedDriver.findAndExtendReadyToRetryEvents as Mock).mock.calls.length;

await poller.onModuleDestroy();

jest.advanceTimersByTime(inboxOutboxOptions.retryEveryMilliseconds * 5);
vi.advanceTimersByTime(inboxOutboxOptions.retryEveryMilliseconds * 5);
await Promise.resolve();

const callCountAfterShutdown = (mockedDriver.findAndExtendReadyToRetryEvents as jest.Mock).mock.calls.length;
const callCountAfterShutdown = (mockedDriver.findAndExtendReadyToRetryEvents as Mock).mock.calls.length;
expect(callCountAfterShutdown).toBe(callCountBeforeShutdown);
});

Expand All @@ -102,7 +103,7 @@ describe('RetryableInboxOutboxEventPoller', () => {
resolveProcessing = resolve;
});

(mockInboxOutboxEventProcessor.process as jest.Mock).mockReturnValue(processingPromise);
(mockInboxOutboxEventProcessor.process as Mock).mockReturnValue(processingPromise);

const mockEvent = {
id: 1,
Expand All @@ -113,12 +114,12 @@ describe('RetryableInboxOutboxEventPoller', () => {
expireAt: Date.now() + 1000,
insertedAt: Date.now(),
};
(mockedDriver.findAndExtendReadyToRetryEvents as jest.Mock).mockResolvedValue([mockEvent]);
(mockedDriver.findAndExtendReadyToRetryEvents as Mock).mockResolvedValue([mockEvent]);

const poller = createPoller();
await poller.onModuleInit();

jest.advanceTimersByTime(inboxOutboxOptions.retryEveryMilliseconds);
vi.advanceTimersByTime(inboxOutboxOptions.retryEveryMilliseconds);
await Promise.resolve();
await Promise.resolve();

Expand All @@ -143,7 +144,7 @@ describe('RetryableInboxOutboxEventPoller', () => {
});

it('should handle shutdown when no in-flight processing exists', async () => {
(mockedDriver.findAndExtendReadyToRetryEvents as jest.Mock).mockResolvedValue([]);
(mockedDriver.findAndExtendReadyToRetryEvents as Mock).mockResolvedValue([]);
const poller = createPoller();
await poller.onModuleInit();

Expand Down
3 changes: 2 additions & 1 deletion packages/core/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
"forceConsistentCasingInFileNames": false,
"noFallthroughCasesInSwitch": false
},
"exclude": ["node_modules", "dist"]
"include": ["src/**/*"],
"exclude": ["node_modules", "dist", "src/test"]
}
15 changes: 15 additions & 0 deletions packages/core/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { defineConfig } from 'vitest/config';
import swc from 'unplugin-swc';

export default defineConfig({
test: {
globals: true,
environment: 'node',
include: ['src/**/*.spec.ts'],
},
plugins: [
swc.vite({
module: { type: 'es6' },
}),
],
});
2 changes: 1 addition & 1 deletion packages/mikroorm-driver/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
"forceConsistentCasingInFileNames": false,
"noFallthroughCasesInSwitch": false
},
"exclude": ["node_modules", "dist"]
"exclude": ["node_modules", "dist", "src/test"]
}
Loading