refactor: some codestyle fixes in resolver helpers

Author: nodkz

src/resolvers/helpers/dataLoaderHelper.ts

@@ -1,12 +1,12 @@
 import DataLoader, { BatchLoadFn } from 'dataloader';
 import { GraphQLResolveInfo } from 'graphql-compose/lib/graphql';
 
-export function getDataLoader(
-  context: Record<string, any>,
+export function getDataLoader<TContext extends Record<any, any> = any>(
+  context: TContext,
   info: GraphQLResolveInfo,
   batchLoadFn: BatchLoadFn<any, any>
 ): DataLoader<any, any> {
-  if (!context._gqlDataLoaders) context._gqlDataLoaders = new WeakMap();
+  if (!context._gqlDataLoaders) (context as any)._gqlDataLoaders = new WeakMap();
   const { _gqlDataLoaders } = context;
 
   // for different parts of GraphQL queries, key will be new

src/resolvers/helpers/filter.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-use-before-define */
 
 import { ObjectTypeComposer, ObjectTypeComposerArgumentConfigMap } from 'graphql-compose';
-import type { Model } from 'mongoose';
+import type { Model, Document } from 'mongoose';
 import { isObject, toMongoFilterDottedObject, getIndexedFieldNamesForGraphQL } from '../../utils';
 import type { ExtendedResolveParams } from '../index';
 import {
@@ -33,11 +33,11 @@ export const getFilterHelperArgOptsMap = (): Record<string, string | string[]> =
   removeFields: ['string', 'string[]'],
 });
 
-export const filterHelperArgs = (
-  typeComposer: ObjectTypeComposer<any, any>,
-  model: Model<any>,
+export function filterHelperArgs<TDoc extends Document = any>(
+  typeComposer: ObjectTypeComposer<TDoc, any>,
+  model: Model<TDoc>,
   opts?: FilterHelperArgsOpts
-): ObjectTypeComposerArgumentConfigMap<{ filter: any }> => {
+): ObjectTypeComposerArgumentConfigMap<{ filter: any }> {
   if (!(typeComposer instanceof ObjectTypeComposer)) {
     throw new Error('First arg for filterHelperArgs() should be instance of ObjectTypeComposer.');
   }
@@ -95,7 +95,7 @@ export const filterHelperArgs = (
       description: opts.onlyIndexed ? 'Filter only by indexed fields' : 'Filter by fields',
     },
   };
-};
+}
 
 export function filterHelper(
   resolveParams: ExtendedResolveParams,

src/resolvers/helpers/filterOperators.ts

@@ -221,7 +221,7 @@ export type SelectorOptions = {
   [k: string]: SelectorOptions | string | string[] | RegExp;
 };
 
-export const _recurseFields = (fields: SelectorOptions): SelectorOptions => {
+export function _recurseFields(fields: SelectorOptions): SelectorOptions {
   let selectors: SelectorOptions = {};
   if (fields === Object(fields)) {
     Object.keys(fields).forEach((fieldName) => {
@@ -240,7 +240,7 @@ export const _recurseFields = (fields: SelectorOptions): SelectorOptions => {
     selectors = fields;
   }
   return selectors;
-};
+}
 
 export function processFilterOperators(filter: Record<string, any>): SelectorOptions {
   if (!filter) return filter;

src/resolvers/helpers/limit.ts

@@ -8,16 +8,16 @@ export type LimitHelperArgsOpts = {
 // for merging, discriminators merge-able only
 export const getLimitHelperArgsOptsMap = (): Record<string, string> => ({ defaultValue: 'number' });
 
-export const limitHelperArgs = (
+export function limitHelperArgs(
   opts?: LimitHelperArgsOpts
-): ObjectTypeComposerArgumentConfigMapDefinition<{ limit: any }> => {
+): ObjectTypeComposerArgumentConfigMapDefinition<{ limit: any }> {
   return {
     limit: {
       type: 'Int',
       defaultValue: (opts && opts.defaultValue) || 1000,
     },
   };
-};
+}
 
 export function limitHelper(resolveParams: ExtendedResolveParams): void {
   const limit = parseInt(resolveParams.args && resolveParams.args.limit, 10) || 0;

src/resolvers/helpers/record.ts

@@ -4,6 +4,7 @@ import {
   InputTypeComposer,
 } from 'graphql-compose';
 import { makeFieldsRecursiveNullable } from '../../utils/makeFieldsRecursiveNullable';
+import { Document } from 'mongoose';
 
 export type RecordHelperArgsOpts = {
   prefix?: string;
@@ -22,10 +23,10 @@ export const getRecordHelperArgsOptsMap = (): Record<string, string> => ({
   requiredFields: 'string[]',
 });
 
-export const recordHelperArgs = (
-  tc: ObjectTypeComposer<any, any>,
+export function recordHelperArgs<TDoc extends Document = any>(
+  tc: ObjectTypeComposer<TDoc, any>,
   opts?: RecordHelperArgsOpts
-): ObjectTypeComposerArgumentConfigMapDefinition<{ record: any }> => {
+): ObjectTypeComposerArgumentConfigMapDefinition<{ record: any }> {
   if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
     throw new Error('First arg for recordHelperArgs() should be instance of ObjectTypeComposer.');
   }
@@ -62,4 +63,4 @@ export const recordHelperArgs = (
       type: opts.isRequired ? recordITC.NonNull : recordITC,
     },
   };
-};
+}

src/resolvers/helpers/skip.ts

@@ -1,13 +1,13 @@
 import type { ObjectTypeComposerArgumentConfigMapDefinition } from 'graphql-compose';
 import type { ExtendedResolveParams } from '../index';
 
-export const skipHelperArgs = (): ObjectTypeComposerArgumentConfigMapDefinition<{ skip: any }> => {
+export function skipHelperArgs(): ObjectTypeComposerArgumentConfigMapDefinition<{ skip: any }> {
   return {
     skip: {
       type: 'Int',
     },
   };
-};
+}
 
 export function skipHelper(resolveParams: ExtendedResolveParams): void {
   const skip = parseInt(resolveParams && resolveParams.args && resolveParams.args.skip, 10);

src/resolvers/helpers/sort.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-use-before-define */
 
-import type { Model } from 'mongoose';
+import type { Model, Document } from 'mongoose';
 import type {
   ObjectTypeComposerArgumentConfigMapDefinition,
   ObjectTypeComposer,
@@ -14,11 +14,11 @@ export type SortHelperArgsOpts = {
   sortTypeName?: string;
 };
 
-export const sortHelperArgs = (
-  tc: ObjectTypeComposer<any, any>,
-  model: Model<any>,
+export function sortHelperArgs<TDoc extends Document = any>(
+  tc: ObjectTypeComposer<TDoc, any>,
+  model: Model<TDoc>,
   opts?: SortHelperArgsOpts
-): ObjectTypeComposerArgumentConfigMapDefinition<{ sort: any }> => {
+): ObjectTypeComposerArgumentConfigMapDefinition<{ sort: any }> {
   if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
     throw new Error('First arg for sortHelperArgs() should be instance of ObjectTypeComposer.');
   }
@@ -38,7 +38,7 @@ export const sortHelperArgs = (
       type: gqSortType,
     },
   };
-};
+}
 
 export function sortHelper(resolveParams: ExtendedResolveParams): void {
   const sort = resolveParams && resolveParams.args && resolveParams.args.sort;