Skip to content

Commit 5753c87

Browse files
committed
build: fix eslint warnings
1 parent c457e21 commit 5753c87

File tree

14 files changed

+43
-27
lines changed

14 files changed

+43
-27
lines changed

src/composeWithMongoose.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export function prepareFields(
164164
only?: string[];
165165
remove?: string[];
166166
}
167-
) {
167+
): void {
168168
if (Array.isArray(opts.only)) {
169169
const onlyFieldNames: string[] = opts.only;
170170
const removeFields = Object.keys(tc.getFields()).filter(
@@ -184,7 +184,7 @@ export function prepareInputFields(
184184
remove?: string[];
185185
required?: string[];
186186
}
187-
) {
187+
): void {
188188
if (Array.isArray(inputFieldsOpts.only)) {
189189
const onlyFieldNames: string[] = inputFieldsOpts.only;
190190
const removeFields = Object.keys(inputTypeComposer.getFields()).filter(

src/discriminators/DiscriminatorTypeComposer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { composeChildTC } from './composeChildTC';
1515
import { mergeCustomizationOptions } from './utils/mergeCustomizationOptions';
1616
import { prepareBaseResolvers } from './prepareBaseResolvers';
1717
import { reorderFields } from './utils/reorderFields';
18-
import { GraphQLFieldConfig } from 'graphql-compose/lib/graphql';
18+
import { GraphQLFieldConfig, GraphQLObjectType } from 'graphql-compose/lib/graphql';
1919

2020
export interface ComposeWithMongooseDiscriminatorsOpts<TContext>
2121
extends ComposeWithMongooseOpts<TContext> {
@@ -75,15 +75,15 @@ export class DiscriminatorTypeComposer<TSource, TContext> extends ObjectTypeComp
7575
DInterface?: InterfaceTypeComposer<TSource, TContext>;
7676
DKeyETC?: EnumTypeComposer<TContext>;
7777

78-
constructor(gqType: any, schemaComposer: SchemaComposer<TContext>) {
78+
constructor(gqType: GraphQLObjectType, schemaComposer: SchemaComposer<TContext>) {
7979
super(gqType, schemaComposer);
8080
return this;
8181
}
8282

8383
static createFromModel<TSrc = any, TCtx = any>(
8484
baseModel: Model<any>,
8585
schemaComposer: SchemaComposer<TCtx>,
86-
opts?: any
86+
opts?: ComposeWithMongooseDiscriminatorsOpts<any>
8787
): DiscriminatorTypeComposer<TSrc, TCtx> {
8888
if (!baseModel || !baseModel.discriminators) {
8989
throw Error('Discriminator Key not Set, Use composeWithMongoose for Normal Collections');

src/discriminators/__mocks__/characterModels.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const enumCharacterType = {
1111
export const CharacterObject = {
1212
_id: {
1313
type: String,
14-
default: () => new Types.ObjectId(),
14+
default: (): any => new Types.ObjectId(),
1515
},
1616
name: String,
1717

@@ -33,7 +33,9 @@ export const CharacterObject = {
3333
const CharacterSchema = new Schema(CharacterObject);
3434
const ACharacterSchema = new Schema({ ...CharacterObject });
3535

36-
export function getCharacterModels(DKey: string) {
36+
export function getCharacterModels(
37+
DKey: string
38+
): { CharacterModel: Model<any>; PersonModel: Model<any>; DroidModel: Model<any> } {
3739
CharacterSchema.set('discriminatorKey', DKey);
3840

3941
const CharacterModel: Model<any> = mongoose.models.Character
@@ -51,7 +53,7 @@ export function getCharacterModels(DKey: string) {
5153
return { CharacterModel, PersonModel, DroidModel };
5254
}
5355

54-
export function getCharacterModelClone() {
56+
export function getCharacterModelClone(): { NoDKeyCharacterModel: Model<any> } {
5557
const NoDKeyCharacterModel = mongoose.model('NoDKeyCharacter', ACharacterSchema);
5658

5759
/*

src/discriminators/prepareBaseResolvers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function setDKeyEnumOnITCArgs(resolver: Resolver, baseTC: DiscriminatorTypeCompo
2727
// recomposing sets up the DInterface as the return types for
2828
// Also sets up DKey enum as type for DKey field on composers with filter and/or record args
2929
// composeWithMongoose composers
30-
export function prepareBaseResolvers(baseTC: DiscriminatorTypeComposer<any, any>) {
30+
export function prepareBaseResolvers(baseTC: DiscriminatorTypeComposer<any, any>): void {
3131
for (const resolverName in EMCResolvers) {
3232
if (EMCResolvers.hasOwnProperty(resolverName) && baseTC.hasResolver(resolverName)) {
3333
const resolver = baseTC.getResolver(resolverName);

src/discriminators/prepareChildResolvers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export function prepareChildResolvers<TSource, TContext>(
135135
baseDTC: DiscriminatorTypeComposer<TSource, TContext>,
136136
childTC: ObjectTypeComposer<TSource, TContext>,
137137
opts: ComposeWithMongooseDiscriminatorsOpts<TContext>
138-
) {
138+
): void {
139139
for (const resolverName in EMCResolvers) {
140140
if (EMCResolvers.hasOwnProperty(resolverName) && childTC.hasResolver(resolverName)) {
141141
const resolver = childTC.getResolver(resolverName);

src/discriminators/utils/mergeTypeConverterResolversOpts.ts

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
12
import type { TypeConverterResolversOpts } from '../../composeWithMongoose';
23
import { MergeAbleHelperArgsOpts } from '../../resolvers/helpers';
34
import { mergeStringAndStringArraysFields } from './mergeCustomizationOptions';
@@ -31,9 +32,9 @@ export function mergePrimitiveTypeFields(
3132
export function mergeFilterOperatorsOptsMap(
3233
baseFilterOperatorField: TypeFieldMap,
3334
childFilterOperatorField?: TypeFieldMap
34-
) {
35+
): TypeFieldMap {
3536
const baseOptsKeys = Object.keys(baseFilterOperatorField);
36-
const baseOptsTypes = {} as Record<string, any>;
37+
const baseOptsTypes = {} as TypeFieldMap;
3738
for (const key of baseOptsKeys) {
3839
baseOptsTypes[key] = 'string[]';
3940
}
@@ -49,7 +50,13 @@ export function mergeFilterOperatorsOptsMap(
4950
return childFilterOperatorField;
5051
}
5152

52-
export function mergeArraysTypeFields(baseField: any, childField: any, argOptsType: TypeFieldMap) {
53+
export function mergeArraysTypeFields(
54+
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
55+
baseField: any,
56+
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
57+
childField: any,
58+
argOptsType: TypeFieldMap
59+
): TypeFieldMap {
5360
let merged = childField !== undefined ? childField : {};
5461
if (Array.isArray(argOptsType)) {
5562
for (const argType of argOptsType) {
@@ -68,7 +75,11 @@ export function mergeArraysTypeFields(baseField: any, childField: any, argOptsTy
6875
return merged;
6976
}
7077

71-
export function mergeMapTypeFields(baseField: any, childField: any, argOptsTypes: TypeFieldMap) {
78+
export function mergeMapTypeFields(
79+
baseField: TypeFieldMap,
80+
childField: TypeFieldMap | undefined,
81+
argOptsTypes: TypeFieldMap
82+
): TypeFieldMap {
7283
const merged = childField === undefined ? {} : childField;
7384

7485
if (argOptsTypes !== null && typeof argOptsTypes === 'object') {

src/discriminators/utils/reorderFields.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export function reorderFields<TContext>(
66
order: string[] | boolean | undefined,
77
DKey: string,
88
commonFieldKeys?: string[]
9-
) {
9+
): DiscriminatorTypeComposer<any, TContext> | ObjectTypeComposer<any, TContext> {
1010
if (order) {
1111
if (Array.isArray(order)) {
1212
modelTC.reorderFields(order);

src/resolvers/createMany.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ export default function createMany<TSource = Document, TContext = any>(
5959
t.addFields({
6060
recordIds: {
6161
type: '[MongoID!]!',
62-
description: 'Created document ID',
62+
description: 'Created document IDs',
6363
},
6464
records: {
6565
type: tc.NonNull.List,
6666
description: 'Created documents',
6767
},
6868
createCount: {
6969
type: 'Int!',
70-
description: 'Count of all documents created',
70+
description: 'Number of created documents',
7171
},
7272
});
7373
});

src/resolvers/findById.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
22
import type { Model, Document } from 'mongoose';
33
import { projectionHelper, prepareAliases } from './helpers';
4-
import type { ExtendedResolveParams, GenResolverOpts } from './index';
4+
import type { ExtendedResolveParams } from './index';
55
import { beforeQueryHelper } from './helpers/beforeQueryHelper';
66

77
export default function findById<TSource = Document, TContext = any>(
88
model: Model<any>,
9-
tc: ObjectTypeComposer<TSource, TContext>,
10-
_opts?: GenResolverOpts // eslint-disable-line no-unused-vars
9+
tc: ObjectTypeComposer<TSource, TContext>
10+
// _opts?: GenResolverOpts
1111
): Resolver<TSource, TContext> {
1212
if (!model || !model.modelName || !model.schema) {
1313
throw new Error('First arg for Resolver findById() should be instance of Mongoose Model.');

src/resolvers/helpers/filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export type FilterHelperArgsOpts = {
2424
};
2525

2626
// for merging, discriminators merge-able only
27-
export const getFilterHelperArgOptsMap = () => ({
27+
export const getFilterHelperArgOptsMap = (): Record<string, string | string[]> => ({
2828
// filterTypeName? : 'string'
2929
isRequired: 'boolean',
3030
onlyIndexed: 'boolean',

0 commit comments

Comments
 (0)