eslint fixes (#8871)

dimaMachina · web-flow · commit fc79b65d4914 · 2023-01-31T00:16:20.000+01:00
diff --git a/.changeset/eight-mugs-pay.md b/.changeset/eight-mugs-pay.md
@@ -0,0 +1,11 @@
+---
+'@graphql-codegen/core': patch
+'@graphql-codegen/visitor-plugin-common': patch
+'@graphql-codegen/typescript-resolvers': patch
+'@graphql-codegen/client-preset': patch
+'@graphql-codegen/gql-tag-operations-preset': patch
+'@graphql-codegen/graphql-modules-preset': patch
+'@graphql-codegen/plugin-helpers': patch
+---
+
+eslint fixes
diff --git a/examples/typescript-esm/src/executeOperation.ts b/examples/typescript-esm/src/executeOperation.ts
@@ -26,7 +26,7 @@ export function executeOperation<TResult, TVariables>(
     request.write(
       JSON.stringify({
         query: print(operation),
-        variables: variables != null ? variables : undefined,
+        variables: variables == null ? undefined : variables,
       })
     );
     request.end();
diff --git a/packages/graphql-codegen-core/src/codegen.ts b/packages/graphql-codegen-core/src/codegen.ts
@@ -130,13 +130,7 @@ export async function codegen(options: Types.GenerateOptions): Promise<string> {
       const pluginPackage = options.pluginMap[name];
       const pluginConfig = plugin[name] || {};
 
-      const execConfig =
-        typeof pluginConfig !== 'object'
-          ? pluginConfig
-          : {
-              ...options.config,
-              ...pluginConfig,
-            };
+      const execConfig = typeof pluginConfig === 'object' ? { ...options.config, ...pluginConfig } : pluginConfig;
 
       const result = await profiler.run(
         () =>
diff --git a/packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts b/packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts
@@ -952,7 +952,7 @@ export class BaseResolversVisitor<
   }
 
   protected isMapperImported(groupedMappers: GroupedMappers, identifier: string, source: string): boolean {
-    const exists = !groupedMappers[source] ? false : !!groupedMappers[source].find(m => m.identifier === identifier);
+    const exists = groupedMappers[source] ? !!groupedMappers[source].find(m => m.identifier === identifier) : false;
     const existsFromEnums = !!Object.keys(this.config.enumValues)
       .map(key => this.config.enumValues[key])
       .find(o => o.sourceFile === source && o.typeIdentifier === identifier);
diff --git a/packages/plugins/other/visitor-plugin-common/src/base-types-visitor.ts b/packages/plugins/other/visitor-plugin-common/src/base-types-visitor.ts
@@ -879,7 +879,7 @@ export class BaseTypesVisitor<
             ? schemaEnumType.getValue(enumOption.name as any).value
             : undefined;
         let enumValue: string | number =
-          typeof schemaEnumValue !== 'undefined' ? schemaEnumValue : (enumOption.name as any);
+          typeof schemaEnumValue === 'undefined' ? (enumOption.name as any) : schemaEnumValue;
 
         if (
           this.config.enumValues[typeName]?.mappedValues &&
diff --git a/packages/plugins/other/visitor-plugin-common/src/imports.ts b/packages/plugins/other/visitor-plugin-common/src/imports.ts
@@ -96,5 +96,5 @@ export function clearExtension(path: string): string {
 }
 
 export function fixLocalFilePath(path: string): string {
-  return !path.startsWith('..') ? `./${path}` : path;
+  return path.startsWith('..') ? path : `./${path}`;
 }
diff --git a/packages/plugins/other/visitor-plugin-common/src/selection-set-to-object.ts b/packages/plugins/other/visitor-plugin-common/src/selection-set-to-object.ts
@@ -446,15 +446,7 @@ export class SelectionSetToObject<Config extends ParsedDocumentsConfig = ParsedD
     for (const selectionNode of selectionNodes) {
       if ('kind' in selectionNode) {
         if (selectionNode.kind === 'Field') {
-          if (!selectionNode.selectionSet) {
-            if (selectionNode.alias) {
-              primitiveAliasFields.set(selectionNode.alias.value, selectionNode);
-            } else if (selectionNode.name.value === '__typename') {
-              requireTypename = true;
-            } else {
-              primitiveFields.set(selectionNode.name.value, selectionNode);
-            }
-          } else {
+          if (selectionNode.selectionSet) {
             let selectedField: GraphQLField<any, any, any> = null;
 
             const fields = parentSchemaType.getFields();
@@ -470,21 +462,27 @@ export class SelectionSetToObject<Config extends ParsedDocumentsConfig = ParsedD
 
             const fieldName = getFieldNodeNameValue(selectionNode);
             let linkFieldNode = linkFieldSelectionSets.get(fieldName);
-            if (!linkFieldNode) {
-              linkFieldNode = {
-                selectedFieldType: selectedField.type,
-                field: selectionNode,
-              };
-            } else {
+            if (linkFieldNode) {
               linkFieldNode = {
                 ...linkFieldNode,
                 field: {
                   ...linkFieldNode.field,
                   selectionSet: mergeSelectionSets(linkFieldNode.field.selectionSet, selectionNode.selectionSet),
                 },
               };
+            } else {
+              linkFieldNode = {
+                selectedFieldType: selectedField.type,
+                field: selectionNode,
+              };
             }
             linkFieldSelectionSets.set(fieldName, linkFieldNode);
+          } else if (selectionNode.alias) {
+            primitiveAliasFields.set(selectionNode.alias.value, selectionNode);
+          } else if (selectionNode.name.value === '__typename') {
+            requireTypename = true;
+          } else {
+            primitiveFields.set(selectionNode.name.value, selectionNode);
           }
         } else if (selectionNode.kind === 'Directive') {
           if (['skip', 'include'].includes(selectionNode?.name?.value)) {
diff --git a/packages/plugins/other/visitor-plugin-common/src/utils.ts b/packages/plugins/other/visitor-plugin-common/src/utils.ts
@@ -59,7 +59,7 @@ export function wrapWithSingleQuotes(value: string | number | NameNode, skipNume
 
   if (
     typeof value === 'number' ||
-    (typeof value === 'string' && !isNaN(parseInt(value)) && parseFloat(value).toString() === value)
+    (typeof value === 'string' && !Number.isNaN(parseInt(value)) && parseFloat(value).toString() === value)
   ) {
     return String(value);
   }
@@ -232,7 +232,7 @@ export class DeclarationBlock {
     }
 
     return stripTrailingSpaces(
-      (this._comment ? this._comment : '') +
+      (this._comment || '') +
         result +
         (this._kind === 'interface' || this._kind === 'enum' || this._kind === 'namespace' || this._kind === 'function'
           ? ''
diff --git a/packages/plugins/typescript/resolvers/src/index.ts b/packages/plugins/typescript/resolvers/src/index.ts
@@ -55,7 +55,7 @@ export type Resolver${capitalizedDirectiveName}WithResolve<TResult, TParent, TCo
         } else {
           prepend.push(
             `${importType} { ${parsedMapper.import} ${
-              parsedMapper.import !== resolverFnName ? `as ${resolverFnName} ` : ''
+              parsedMapper.import === resolverFnName ? '' : `as ${resolverFnName} `
             }} from '${parsedMapper.source}';`
           );
         }
@@ -166,7 +166,7 @@ export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
       } else {
         prepend.push(
           `${importType} { ${parsedMapper.import} ${
-            parsedMapper.import !== 'ResolverFn' ? 'as ResolverFn ' : ''
+            parsedMapper.import === 'ResolverFn' ? '' : 'as ResolverFn '
           }} from '${parsedMapper.source}';`
         );
       }
@@ -268,7 +268,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
       }
       prepend.push(
         `import { ${parsedMapper.import} ${
-          parsedMapper.import !== 'GraphQLResolveInfo' ? 'as GraphQLResolveInfo' : ''
+          parsedMapper.import === 'GraphQLResolveInfo' ? '' : 'as GraphQLResolveInfo'
         } } from '${parsedMapper.source}';`
       );
     } else {
diff --git a/packages/presets/client/src/index.ts b/packages/presets/client/src/index.ts
@@ -6,11 +6,12 @@ import * as typescriptPlugin from '@graphql-codegen/typescript';
 import * as typescriptOperationPlugin from '@graphql-codegen/typescript-operations';
 import { ClientSideBaseVisitor } from '@graphql-codegen/visitor-plugin-common';
 import { DocumentNode } from 'graphql';
-import babelOptimizerPlugin from './babel.js';
 import * as fragmentMaskingPlugin from './fragment-masking-plugin.js';
 import { generateDocumentHash, normalizeAndPrintDocumentNode } from './persisted-documents.js';
 import { processSources } from './process-sources.js';
 
+export { default as babelOptimizerPlugin } from './babel.js';
+
 export type FragmentMaskingConfig = {
   /** @description Name of the function that should be used for unmasking a masked fragment property.
    * @default `'useFragment'`
@@ -322,8 +323,6 @@ export const preset: Types.OutputPreset<ClientPresetConfig> = {
   },
 };
 
-export { babelOptimizerPlugin };
-
 type Deferred<T = void> = {
   resolve: (value: T) => void;
   reject: (value: unknown) => void;
diff --git a/packages/presets/gql-tag-operations/src/index.ts b/packages/presets/gql-tag-operations/src/index.ts
@@ -5,10 +5,11 @@ import * as typedDocumentNodePlugin from '@graphql-codegen/typed-document-node';
 import * as typescriptPlugin from '@graphql-codegen/typescript';
 import * as typescriptOperationPlugin from '@graphql-codegen/typescript-operations';
 import { ClientSideBaseVisitor } from '@graphql-codegen/visitor-plugin-common';
-import babelPlugin from './babel.js';
 import * as fragmentMaskingPlugin from './fragment-masking-plugin.js';
 import { processSources } from './process-sources.js';
 
+export { default as babelPlugin } from './babel.js';
+
 export type FragmentMaskingConfig = {
   /**
    * @description The module name from which a augmented module should be imported from.
@@ -258,5 +259,3 @@ export const preset: Types.OutputPreset<GqlTagConfig> = {
     ];
   },
 };
-
-export { babelPlugin };
diff --git a/packages/presets/graphql-modules/src/builder.ts b/packages/presets/graphql-modules/src/builder.ts
@@ -151,7 +151,7 @@ export function buildModule(
       '\n}';
   }
 
-  return [...(!shouldDeclare ? imports : []), content].filter(Boolean).join('\n');
+  return [...(shouldDeclare ? [] : imports), content].filter(Boolean).join('\n');
 
   /**
    * A dictionary of fields to pick from an object
diff --git a/packages/utils/plugins-helpers/src/federation.ts b/packages/utils/plugins-helpers/src/federation.ts
@@ -234,7 +234,7 @@ export class ApolloFederation {
         Field(node) {
           return {
             name: node.name.value,
-            selection: node.selectionSet ? node.selectionSet : true,
+            selection: node.selectionSet || true,
           } as SelectionSetField;
         },
         Document(node) {

Original file line number	Diff line number	Diff line change
`@@ -952,7 +952,7 @@ export class BaseResolversVisitor<`
`952`	`952`	`}`
`953`	`953`
`954`	`954`	`protected isMapperImported(groupedMappers: GroupedMappers, identifier: string, source: string): boolean {`
`955`		`- const exists = !groupedMappers[source] ? false : !!groupedMappers[source].find(m => m.identifier === identifier);`
	`955`	`+ const exists = groupedMappers[source] ? !!groupedMappers[source].find(m => m.identifier === identifier) : false;`
`956`	`956`	`const existsFromEnums = !!Object.keys(this.config.enumValues)`
`957`	`957`	`.map(key => this.config.enumValues[key])`
`958`	`958`	`.find(o => o.sourceFile === source && o.typeIdentifier === identifier);`
Original file line number	Diff line number	Diff line change
`@@ -96,5 +96,5 @@ export function clearExtension(path: string): string {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`export function fixLocalFilePath(path: string): string {`
`99`		- return !path.startsWith('..') ? `./${path}` : path;
	`99`	+ return path.startsWith('..') ? path : `./${path}`;
`100`	`100`	`}`