Skip to content

Commit be02ffc

Browse files
author
Boris
committed
fix: right typing
1 parent 511d78d commit be02ffc

30 files changed

+149
-112
lines changed

‎example/src/schema/mutation/index.ts‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SchemaComposer } from 'graphql-compose';
1+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
22
import { createQueueCleanFC } from './queueClean';
33
import { createQueueDrainFC } from './queueDrain';
44
import { createQueuePauseFC } from './queuePause';
@@ -24,23 +24,29 @@ export function createMutationFields({
2424
schemaComposer: SchemaComposer<any>;
2525
}): any {
2626
const generateHelper = createGenerateHelper(schemaComposer);
27-
//TODO: пропустить через map это
27+
28+
function generateWrappedFC(
29+
createFC: (sc: SchemaComposer<any>) => ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>
30+
) {
31+
return generateHelper(createFC(schemaComposer));
32+
}
33+
2834
return {
29-
queueClean: generateHelper(createQueueCleanFC({ schemaComposer })),
30-
queueDrain: generateHelper(createQueueDrainFC({ schemaComposer })),
31-
queuePause: generateHelper(createQueuePauseFC()),
32-
queueResume: generateHelper(createQueueResumeFC()),
33-
queueRemoveRepeatable: generateHelper(createRemoveRepeatableFC()),
34-
35-
jobAdd: generateHelper(createJobAddFC(schemaComposer)),
36-
jobAddRepeatableCron: generateHelper(createJobAddRepeatableCronFC(schemaComposer)),
37-
jobAddRepeatableEvery: generateHelper(createJobAddRepeatableEveryFC(schemaComposer)),
38-
39-
jobDiscard: generateHelper(createJobDiscardFC({ schemaComposer })),
40-
jobPromote: generateHelper(createjobPromoteFC({ schemaComposer })),
41-
jobRemove: generateHelper(createJobRremoveFC(schemaComposer)),
42-
jobRetry: generateHelper(createJobRetryFC({ schemaComposer })),
43-
jobUpdate: generateHelper(createJobUpdateFC(schemaComposer)),
44-
jobLogAdd: generateHelper(createJobLogAddFC({ schemaComposer })),
35+
queueClean: generateWrappedFC(createQueueCleanFC),
36+
queueDrain: generateWrappedFC(createQueueDrainFC),
37+
queuePause: generateWrappedFC(createQueuePauseFC),
38+
queueResume: generateWrappedFC(createQueueResumeFC),
39+
queueRemoveRepeatable: generateWrappedFC(createRemoveRepeatableFC),
40+
41+
jobAdd: generateWrappedFC(createJobAddFC),
42+
jobAddRepeatableCron: generateWrappedFC(createJobAddRepeatableCronFC),
43+
jobAddRepeatableEvery: generateWrappedFC(createJobAddRepeatableEveryFC),
44+
45+
jobDiscard: generateWrappedFC(createJobDiscardFC),
46+
jobPromote: generateWrappedFC(createjobPromoteFC),
47+
jobRemove: generateWrappedFC(createJobRremoveFC),
48+
jobRetry: generateWrappedFC(createJobRetryFC),
49+
jobUpdate: generateWrappedFC(createJobUpdateFC),
50+
jobLogAdd: generateWrappedFC(createJobLogAddFC),
4551
};
4652
}

‎example/src/schema/mutation/jobDiscard.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
import { MutationError } from './helpers/Error';
2-
import { ErrorCodeEnum, getJobStatusEnumTC } from '../types';
1+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
2+
import { MutationError, ErrorCodeEnum } from './helpers/Error';
3+
import { getJobStatusEnumTC } from '../types';
34
import { getQueue } from './helpers/wrapMutationFC';
45

5-
export function createJobDiscardFC({ schemaComposer }) {
6+
export function createJobDiscardFC(
7+
sc: SchemaComposer<any>
8+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
69
return {
7-
type: {
10+
type: sc.createObjectTC({
811
name: 'JobDiscardPayload',
912
fields: {
1013
id: 'String',
11-
state: getJobStatusEnumTC(schemaComposer),
14+
state: getJobStatusEnumTC(sc),
1215
},
13-
},
16+
}),
1417
args: {
1518
queueName: 'String!',
1619
id: 'String!',

‎example/src/schema/mutation/jobLogAdd.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
import { MutationError } from './helpers/Error';
2-
import { ErrorCodeEnum, getJobStatusEnumTC } from '../types';
1+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
2+
import { MutationError, ErrorCodeEnum } from './helpers/Error';
3+
import { getJobStatusEnumTC } from '../types';
34
import { getQueue } from './helpers/wrapMutationFC';
45

5-
export function createJobLogAddFC({ schemaComposer }) {
6+
export function createJobLogAddFC(
7+
sc: SchemaComposer<any>
8+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
69
return {
7-
type: {
10+
type: sc.createObjectTC({
811
name: 'JobLogAddPayload',
912
fields: {
1013
id: 'String',
11-
state: getJobStatusEnumTC(schemaComposer),
14+
state: getJobStatusEnumTC(sc),
1215
},
13-
},
16+
}),
1417
args: {
1518
queueName: 'String!',
1619
id: 'String!',

‎example/src/schema/mutation/jobMoveToCompleted.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from
33
import { getJobTC } from '../types/job/Job';
44

55
export function jobMoveToCompletedFC(
6-
schemaComposer: SchemaComposer<any>
6+
sc: SchemaComposer<any>
77
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
88
return {
9-
type: schemaComposer.createObjectTC({
9+
type: sc.createObjectTC({
1010
name: 'JobMoveToCompletedPayload',
1111
fields: {
1212
id: 'String',
13-
job: getJobTC(schemaComposer),
13+
job: getJobTC(sc),
1414
},
1515
}),
1616
args: {

‎example/src/schema/mutation/jobPromote.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
import { MutationError } from './helpers/Error';
2-
import { ErrorCodeEnum, getJobStatusEnumTC } from '../types';
1+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
2+
import { MutationError, ErrorCodeEnum } from './helpers/Error';
3+
import { getJobStatusEnumTC } from '../types';
34
import { getQueue } from './helpers/wrapMutationFC';
45

5-
export function createjobPromoteFC({ schemaComposer }) {
6+
export function createjobPromoteFC(
7+
sc: SchemaComposer<any>
8+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
69
return {
7-
type: {
10+
type: sc.createObjectTC({
811
name: 'JobPromotePayload',
912
fields: {
1013
id: 'String',
11-
state: getJobStatusEnumTC(schemaComposer),
14+
state: getJobStatusEnumTC(sc),
1215
},
13-
},
16+
}),
1417
args: {
1518
queueName: 'String!',
1619
id: 'String!',

‎example/src/schema/mutation/jobRemove.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
import { getQueue } from './helpers/wrapMutationFC';
2-
import { SchemaComposer } from 'graphql-compose';
2+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
33
import { getJobTC } from '../types/job/Job';
44

5-
export function createJobRremoveFC(schemaComposer: SchemaComposer<any>) {
5+
export function createJobRremoveFC(
6+
sc: SchemaComposer<any>
7+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
68
return {
7-
type: {
9+
type: sc.createObjectTC({
810
name: 'JobRemovePayload',
911
fields: {
1012
id: 'String',
11-
job: getJobTC(schemaComposer),
13+
job: getJobTC(sc),
1214
},
13-
},
15+
}),
1416
args: {
1517
queueName: 'String!',
1618
id: 'String!',

‎example/src/schema/mutation/jobRetry.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
12
import { MutationError, ErrorCodeEnum } from './helpers/Error';
23
import { JobStatusEnum, getJobStatusEnumTC } from '../types';
34
import { getQueue } from './helpers/wrapMutationFC';
45

5-
export function createJobRetryFC({ schemaComposer }) {
6+
export function createJobRetryFC(
7+
sc: SchemaComposer<any>
8+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
69
return {
7-
type: {
10+
type: sc.createObjectTC({
811
name: 'JobRetryPayload',
912
fields: {
1013
id: 'String',
11-
state: getJobStatusEnumTC(schemaComposer),
14+
state: getJobStatusEnumTC(sc),
1215
},
13-
},
16+
}),
1417
args: {
1518
queueName: 'String!',
1619
id: 'String!',

‎example/src/schema/mutation/jobUpdate.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
import { MutationError, ErrorCodeEnum } from './helpers/Error';
22
import { getQueue } from './helpers/wrapMutationFC';
3-
import { SchemaComposer } from 'graphql-compose';
3+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
44
import { getJobTC } from '../types/job/Job';
55

6-
export function createJobUpdateFC(schemaComposer: SchemaComposer<any>) {
6+
export function createJobUpdateFC(
7+
sc: SchemaComposer<any>
8+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
79
return {
8-
type: {
10+
type: sc.createObjectTC({
911
name: 'JobUpdatePayload',
1012
fields: {
11-
job: getJobTC(schemaComposer),
13+
job: getJobTC(sc),
1214
},
13-
},
15+
}),
1416
args: {
1517
queueName: 'String!',
1618
id: 'String!',

‎example/src/schema/mutation/queueClean.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
12
import { getQueue } from './helpers/wrapMutationFC';
23
import { getJobStatusEnumTC } from '../types';
34

4-
export function createQueueCleanFC({ schemaComposer }) {
5+
export function createQueueCleanFC(
6+
sc: SchemaComposer<any>
7+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
58
return {
69
description:
710
'Cleans jobs from a queue. Similar to remove but keeps jobs within a certain grace period',
8-
type: {
11+
type: sc.createObjectTC({
912
name: 'QueueCleanPayload',
1013
fields: {
1114
jobsId: '[String!]', //TODO: Queue.clean возвращает список очищенных id
1215
},
13-
},
16+
}),
1417
args: {
1518
queueName: 'String!',
16-
filter: schemaComposer.createInputTC({
19+
filter: sc.createInputTC({
1720
name: 'QueueCleanFilter',
1821
fields: {
1922
grace: 'Int!',
2023
status: {
21-
type: getJobStatusEnumTC(schemaComposer),
24+
type: getJobStatusEnumTC(sc),
2225
defaultValue: 'completed',
2326
},
2427
limit: {

‎example/src/schema/mutation/queueDrain.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1+
import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
12
import { getQueue } from './helpers/wrapMutationFC';
23

3-
export function createQueueDrainFC() {
4+
export function createQueueDrainFC(
5+
sc: SchemaComposer<any>
6+
): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
47
return {
58
description:
69
'Drains the queue, i.e., removes all jobs that are waiting or delayed, but not active, completed or failed.',
7-
type: {
10+
type: sc.createObjectTC({
811
name: 'QueueDrainPayload',
912
fields: {
1013
jobsId: '[String!]',
1114
},
12-
},
15+
}),
1316
args: {
1417
queueName: 'String!',
1518
delayed: {

0 commit comments

Comments
 (0)