Skip to content

Commit 1a4fbbd

Browse files
nodkznodkz
committed
feat: add [email protected] to peerDependencies; update other dependencies
1 parent 62c3806 commit 1a4fbbd

File tree

12 files changed

+1061
-846
lines changed

12 files changed

+1061
-846
lines changed

Diff for: ‎package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,36 @@
2626
"homepage": "https://github.com/graphql-compose/graphql-compose-bullmq",
2727
"peerDependencies": {
2828
"bullmq": "^1.14.4",
29-
"graphql-compose": "^7.15.0 || ^8.0.0"
29+
"graphql-compose": "^7.15.0 || ^8.0.0 || ^9.0.0"
3030
},
3131
"devDependencies": {
32-
"@types/express": "4.17.11",
32+
"@types/express": "4.17.12",
3333
"@types/express-graphql": "^0.9.0",
3434
"@types/graphql": "^14.5.0",
3535
"@types/jest": "26.0.23",
36-
"@types/node": "15.0.1",
36+
"@types/node": "15.6.1",
3737
"@types/node-fetch": "2.5.10",
38-
"@typescript-eslint/eslint-plugin": "4.22.0",
39-
"@typescript-eslint/parser": "4.22.0",
40-
"bullmq": "1.22.2",
38+
"@typescript-eslint/eslint-plugin": "4.25.0",
39+
"@typescript-eslint/parser": "4.25.0",
40+
"bullmq": "1.28.0",
4141
"cpx": "^1.5.0",
4242
"cross-env": "7.0.3",
43-
"eslint": "7.25.0",
43+
"eslint": "7.27.0",
4444
"eslint-config-airbnb-base": "14.2.1",
4545
"eslint-config-prettier": "8.3.0",
46-
"eslint-plugin-import": "2.22.1",
46+
"eslint-plugin-import": "2.23.4",
4747
"eslint-plugin-prettier": "3.4.0",
4848
"express": "^4.17.1",
4949
"express-graphql": "0.12.0",
5050
"graphql": "15.5.0",
51-
"graphql-compose": "8.0.1",
52-
"jest": "26.6.3",
53-
"prettier": "2.2.1",
51+
"graphql-compose": "9.0.0",
52+
"jest": "27.0.3",
53+
"prettier": "2.3.0",
5454
"rimraf": "3.0.2",
55-
"semantic-release": "17.4.2",
56-
"ts-jest": "26.5.5",
57-
"ts-node": "9.1.1",
58-
"typescript": "4.2.4"
55+
"semantic-release": "17.4.3",
56+
"ts-jest": "27.0.1",
57+
"ts-node": "10.0.0",
58+
"typescript": "4.3.2"
5959
},
6060
"scripts": {
6161
"build": "rimraf lib && tsc -p ./tsconfig.build.json && yarn build-lua",

Diff for: ‎src/helpers/composeFC.ts

+10-9
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@ import { Options } from '../definitions';
33

44
type FC = ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>;
55

6-
type Middleare = (fc: FC, sc: SchemaComposer<any>, opts: Options) => FC;
6+
type Middleware = (fc: FC, sc: SchemaComposer<any>, opts: Options) => FC;
77

88
type Creator = (sc: SchemaComposer<any>, opts: Options) => FC;
99

1010
type Wrapper = (creator: Creator) => FC;
1111

12-
type ComposeFCResult = (...args: Middleare[]) => Wrapper;
12+
type ComposeFCResult = (...args: Middleware[]) => Wrapper;
1313

1414
/**
1515
* Compose several FC creator with middlewares
1616
*/
1717
export function composeFC(sc: SchemaComposer<any>, opts: Options): ComposeFCResult {
18-
return (...middlewares: Middleare[]): Wrapper => (creator: Creator): FC => {
19-
let fc = creator(sc, opts);
20-
for (let i = 0; i < middlewares.length; i++) {
21-
fc = middlewares[i](fc, sc, opts);
22-
}
23-
return fc;
24-
};
18+
return (...middlewares: Middleware[]): Wrapper =>
19+
(creator: Creator): FC => {
20+
let fc = creator(sc, opts);
21+
for (let i = 0; i < middlewares.length; i++) {
22+
fc = middlewares[i](fc, sc, opts);
23+
}
24+
return fc;
25+
};
2526
}

Diff for: ‎src/helpers/queueEventsListen.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function getAsyncIterator(
77
queueName: string,
88
eventName: string,
99
opts: Options
10-
) {
10+
): Required<AsyncIterator<any>> {
1111
const queueEvents = getQueueEventsSingleton(prefix, queueName, opts);
1212
return createAsyncIterator(queueEvents, eventName);
1313
}

Diff for: ‎src/mutation/jobLogAdd.ts

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export function createJobLogAddFC(
3131
const queue = await findQueue(prefix, queueName, opts);
3232
const job = await queue.getJob(id);
3333
if (!job) throw new MutationError('Job not found!', ErrorCodeEnum.JOB_NOT_FOUND);
34+
35+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
3436
const logRes = await job.log(row);
3537
//TODO: в logRes похоже тупо количество записей в логе, подумать что с этим сотворить...
3638

Diff for: ‎src/types/info/Info.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { createMemoryFC } from './Info.memory';
2-
import { SchemaComposer } from 'graphql-compose';
2+
import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
33
import { Options } from '../../definitions';
44

5-
export function getInfoTC(sc: SchemaComposer<any>, opts: Options) {
5+
export function getInfoTC(sc: SchemaComposer<any>, opts: Options): ObjectTypeComposer {
66
const { typePrefix } = opts;
77

88
return sc.getOrCreateOTC(`${typePrefix}Info`, (etc) => {

Diff for: ‎src/types/job/Job.opts.repeat.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { SchemaComposer } from 'graphql-compose';
1+
import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
22
import { Options } from '../../definitions';
33

4-
export function createRepeatOptionsTC(sc: SchemaComposer<any>, opts: Options) {
4+
export function createRepeatOptionsTC(sc: SchemaComposer<any>, opts: Options): ObjectTypeComposer {
55
const { typePrefix } = opts;
66

77
const RepeatOptionsTC = sc.createObjectTC({

Diff for: ‎src/types/job/Job.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { createLogsFC } from './Job.logs';
22
import { createStateFC } from './Job.state';
33
import { createRepeatOptionsTC } from './Job.opts.repeat';
4-
import { SchemaComposer } from 'graphql-compose';
4+
import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
55
import { Options } from '../../definitions';
66
import { Job } from 'bullmq';
77

8-
export function getJobTC(sc: SchemaComposer<any>, opts: Options) {
8+
export function getJobTC(sc: SchemaComposer<any>, opts: Options): ObjectTypeComposer {
99
const { typePrefix, jobDataTC = 'JSON!' } = opts;
1010

1111
return sc.getOrCreateOTC(`${typePrefix}Job`, (etc) => {

Diff for: ‎src/types/queue/Queue.durationAvg.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-unused-vars */
12
import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
23
import { Queue } from 'bullmq';
34
import { Options } from '../../definitions';

Diff for: ‎src/types/queue/Queue.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import { createFailedJobsFC } from './Queue.failedJobs';
1111
import { createWorkersTC } from './Queue.workers';
1212
import { createDurationAvgFC } from './Queue.durationAvg';
1313
import { createJobsMemoryUsageAvgFC } from './Queue.jobsMemoryUsageAvg';
14-
import { SchemaComposer } from 'graphql-compose';
14+
import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
1515
import { Options } from '../../definitions';
1616

17-
export function getQueueTC(sc: SchemaComposer<any>, opts: Options) {
17+
export function getQueueTC(sc: SchemaComposer<any>, opts: Options): ObjectTypeComposer {
1818
const { typePrefix } = opts;
1919

2020
return sc.getOrCreateOTC(`${typePrefix}Queue`, (etc) => {

Diff for: ‎src/types/scalars/JobStatusEnum.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SchemaComposer } from 'graphql-compose';
1+
import { EnumTypeComposer, SchemaComposer } from 'graphql-compose';
22
import { Options } from '../../definitions';
33

44
export enum JobStatusEnum {
@@ -11,7 +11,7 @@ export enum JobStatusEnum {
1111
UNKNOWN = 'unknown',
1212
}
1313

14-
export function getJobStatusEnumTC(sc: SchemaComposer<any>, opts: Options) {
14+
export function getJobStatusEnumTC(sc: SchemaComposer<any>, opts: Options): EnumTypeComposer {
1515
const { typePrefix } = opts;
1616
return sc.getOrCreateETC(`${typePrefix}JobStatusEnum`, (etc) => {
1717
etc.addFields({

Diff for: ‎src/types/scalars/OrderEnum.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { SchemaComposer } from 'graphql-compose';
1+
import { EnumTypeComposer, SchemaComposer } from 'graphql-compose';
22
import { Options } from '../../definitions';
33

44
export enum OrderEnum {
55
ASC = 'asc',
66
DESC = 'desc',
77
}
88

9-
export function getOrderEnumTC(sc: SchemaComposer<any>, opts: Options) {
9+
export function getOrderEnumTC(sc: SchemaComposer<any>, opts: Options): EnumTypeComposer {
1010
const { typePrefix } = opts;
1111
return sc.getOrCreateETC(`${typePrefix}OrderEnum`, (etc) => {
1212
etc.addFields({

0 commit comments

Comments
 (0)