Skip to content

Commit

Permalink
refactor!: reorganize and rewrite shared components
Browse files Browse the repository at this point in the history
  • Loading branch information
weyoss committed Feb 16, 2024
1 parent 89891c4 commit 66d59e9
Show file tree
Hide file tree
Showing 60 changed files with 1,546 additions and 663 deletions.
2 changes: 1 addition & 1 deletion .npmignore
Expand Up @@ -9,7 +9,7 @@ tests/**
.prettierrc
index.ts
tsconfig.json
jest.config.cjs
jest.config.js
.idea
types/**
coverage/**
Expand Down
15 changes: 8 additions & 7 deletions index.ts
Expand Up @@ -10,17 +10,18 @@
export * from './types';
export * from './src/errors';
export * from './src/logger/errors';
export * from './src/ticker/errors';
export * from './src/lock/errors';
export * from './src/timer/errors';
export * from './src/locker/errors';
export * from './src/redis-client/errors';
export * from './src/worker/errors';
export { Lock } from './src/lock/lock';
export { Locker } from './src/locker/locker';
export { PowerSwitch } from './src/power-switch/power-switch';
export { RedisClient } from './src/redis-client/redis-client';
export { Ticker } from './src/ticker/ticker';
export { Worker } from './src/worker/worker';
export { WorkerRunner } from './src/worker/worker-runner/worker-runner';
export { WorkerPool } from './src/worker/worker-runner/worker-pool';
export { Timer } from './src/timer/timer';
export { Runnable } from './src/runnable/runnable';
export { WorkerCallable } from './src/worker/worker-callable';
export { WorkerRunnable } from './src/worker/worker-runnable';
export { WorkerResourceGroup } from './src/worker/worker-resource-group';
export { logger } from './src/logger/logger';
export { async } from './src/async/async';
export { redis } from './src/redis-client';
Expand Down
2 changes: 1 addition & 1 deletion jest.config.cjs → jest.config.js
Expand Up @@ -12,7 +12,7 @@ const { resolve } = require('path');

module.exports = {
rootDir: resolve('./'),
testMatch: ['**/dist/**/*.test.js'],
testMatch: ['<rootDir>/dist/tests/**/*.test.js'],
setupFilesAfterEnv: ['<rootDir>/dist/tests/jest.setup.js'],
coverageDirectory: '<rootDir>/coverage',
};
207 changes: 207 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions package.json
Expand Up @@ -30,9 +30,8 @@
"bugs": {
"url": "https://github.com/weyoss/redis-smq-common/issues"
},
"type": "module",
"main": "dist/index.cjs",
"module": "dist/index.js",
"type": "commonjs",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"dependencies": {
"@redis/client": "1.1.0",
Expand Down Expand Up @@ -66,7 +65,7 @@
"scripts": {
"build": "scripts/build.sh",
"test": "scripts/test.sh",
"release": "scripts/release.sh",
"release": "scripts/release/release.sh",
"format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\"",
"lint": "eslint \"{src,tests,types}/**/*.ts\"",
"type-coverage": "type-coverage --strict --at-least 100 --ignore-files \"dist/**/*\"",
Expand Down
7 changes: 5 additions & 2 deletions scripts/build.sh
Expand Up @@ -10,7 +10,10 @@
set -x
set -e

npm run type-coverage
npm run lint
npm run format
rm -rf dist
tsc
tsc -p ./tsconfig.json
cp -r src/redis-client/lua dist/src/redis-client/
cp -r src/lock/redis-client dist/src/lock/
cp -r src/locker/redis-client dist/src/locker/
5 changes: 0 additions & 5 deletions scripts/test.sh
Expand Up @@ -12,9 +12,4 @@ set -e

export NODE_ENV=test
npm run build
cat >dist/package.json <<!EOF
{
"type": "commonjs"
}
!EOF
jest --runInBand --verbose --collectCoverage "$@"
4 changes: 2 additions & 2 deletions src/errors/callback-empty-reply.error.ts
Expand Up @@ -7,9 +7,9 @@
* in the root directory of this source tree.
*/

import { RedisSMQError } from './redis-smq.error';
import { PanicError } from './panic.error.js';

export class CallbackEmptyReplyError extends RedisSMQError {
export class CallbackEmptyReplyError extends PanicError {
constructor() {
super(`Expected a non-empty reply`);
}
Expand Down

0 comments on commit 66d59e9

Please sign in to comment.