commit (#8801)

.eslintrc.cjs

@@ -23,7 +23,6 @@ module.exports = {
     'unicorn/filename-case': 'off',
     'import/extensions': 'off',
     'import/no-default-export': 'off',
-    'logical-assignment-operators': 'off',
     // todo: enable in v3
     'unicorn/prefer-node-protocol': 'off',
   },

package.json

@@ -39,16 +39,14 @@
     "@graphql-typed-document-node/core": "3.1.1",
     "@reduxjs/toolkit": "1.8.5",
     "@tanstack/react-query": "4.2.3",
-    "@theguild/eslint-config": "0.4.2",
+    "@theguild/eslint-config": "0.5.0",
     "@theguild/prettier-config": "0.1.1",
     "@types/common-tags": "1.8.1",
     "@types/jest": "28.1.8",
     "@types/mkdirp": "1.0.2",
     "@types/node": "18.11.18",
     "@types/react": "18.0.18",
     "@types/webpack-env": "1.18.0",
-    "@typescript-eslint/eslint-plugin": "5.36.2",
-    "@typescript-eslint/parser": "5.36.2",
     "@urql/exchange-graphcache": "5.0.5",
     "@vue/apollo-composable": "4.0.0-alpha.19",
     "@vue/composition-api": "1.7.0",
@@ -59,13 +57,7 @@
     "bob-the-bundler": "4.0.0",
     "chalk": "4.1.2",
     "dotenv": "16.0.2",
-    "eslint": "8.23.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-config-standard": "17.0.0",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-n": "15.2.5",
-    "eslint-plugin-promise": "6.0.1",
-    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint": "8.31.0",
     "flow-bin": "0.186.0",
     "flow-parser": "0.186.0",
     "fs-extra": "10.1.0",

packages/graphql-codegen-cli/src/config.ts

@@ -121,9 +121,9 @@ export async function loadCodegenConfig({
   packageProp,
   loaders: customLoaders,
 }: LoadCodegenConfigOptions): Promise<LoadCodegenConfigResult> {
-  configFilePath = configFilePath || process.cwd();
-  moduleName = moduleName || 'codegen';
-  packageProp = packageProp || moduleName;
+  configFilePath ||= process.cwd();
+  moduleName ||= 'codegen';
+  packageProp ||= moduleName;
   const cosmi = cosmiconfig(moduleName, {
     searchPlaces: generateSearchPlaces(moduleName).concat(additionalSearchPlaces || []),
     packageProp,

packages/graphql-codegen-cli/src/init/helpers.ts

@@ -76,16 +76,12 @@ export async function writePackage(answers: Answers, configLocation: string) {
   const pkg = JSON.parse(pkgContent);
   const { indent } = detectIndent(pkgContent);
 
-  if (!pkg.scripts) {
-    pkg.scripts = {};
-  }
+  pkg.scripts ||= {};
 
   pkg.scripts[answers.script] = `graphql-codegen --config ${configLocation}`;
 
   // plugin
-  if (!pkg.devDependencies) {
-    pkg.devDependencies = {};
-  }
+  pkg.devDependencies ||= {};
 
   await Promise.all(
     (answers.plugins || []).map(async plugin => {

packages/graphql-codegen-core/src/codegen.ts

@@ -236,15 +236,11 @@ function validateDuplicateDocuments(files: Types.DocumentFile[]) {
     deduplicatedDefinitions: Set<DefinitionNode>
   ) {
     if (typeof node.name !== 'undefined') {
-      if (!definitionMap[node.kind]) {
-        definitionMap[node.kind] = {};
-      }
-      if (!definitionMap[node.kind][node.name.value]) {
-        definitionMap[node.kind][node.name.value] = {
-          paths: new Set(),
-          contents: new Set(),
-        };
-      }
+      definitionMap[node.kind] ||= {};
+      definitionMap[node.kind][node.name.value] ||= {
+        paths: new Set(),
+        contents: new Set(),
+      };
 
       const definitionKindMap = definitionMap[node.kind];
 

packages/graphql-codegen-core/src/utils.ts

@@ -78,9 +78,7 @@ export function hasFederationSpec(schemaOrAST: GraphQLSchema | DocumentNode) {
 }
 
 export function extractHashFromSchema(schema: GraphQLSchema): string | null {
-  if (!schema.extensions) {
-    schema.extensions = {};
-  }
+  schema.extensions ||= {};
 
   return (schema.extensions['hash'] as string) ?? null;
 }

packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts

@@ -969,9 +969,7 @@ export class BaseResolversVisitor<
 
     const addMapper = (source: string, identifier: string, asDefault: boolean) => {
       if (!this.isMapperImported(groupedMappers, identifier, source)) {
-        if (!groupedMappers[source]) {
-          groupedMappers[source] = [];
-        }
+        groupedMappers[source] ||= [];
 
         groupedMappers[source].push({ identifier, asDefault });
       }

packages/plugins/other/visitor-plugin-common/src/enum-values.ts

@@ -24,7 +24,7 @@ export function parseEnumValues({
         const enumType = schema.getType(enumTypeName) as GraphQLEnumType;
         for (const { name, value } of enumType.getValues()) {
           if (value !== name) {
-            mapOrStr[enumTypeName] = mapOrStr[enumTypeName] || {};
+            mapOrStr[enumTypeName] ||= {};
             if (typeof mapOrStr[enumTypeName] !== 'string' && !mapOrStr[enumTypeName][name]) {
               mapOrStr[enumTypeName][name] = typeof value === 'string' ? escapeString(value) : value;
             }

packages/plugins/other/visitor-plugin-common/src/selection-set-to-object.ts

@@ -230,9 +230,7 @@ export class SelectionSetToObject<Config extends ParsedDocumentsConfig = ParsedD
             possibleTypesForFragment.length === 1 ? null : possibleType.name
           );
 
-          if (!selectionNodesByTypeName[possibleType.name]) {
-            selectionNodesByTypeName[possibleType.name] = [];
-          }
+          selectionNodesByTypeName[possibleType.name] ||= [];
 
           selectionNodesByTypeName[possibleType.name].push({
             fragmentName: spread.name.value,
@@ -326,9 +324,7 @@ export class SelectionSetToObject<Config extends ParsedDocumentsConfig = ParsedD
 
         const selectionNodes = selectionNodesByTypeName.get(typeName) || [];
 
-        if (!prev[typeName]) {
-          prev[typeName] = [];
-        }
+        prev[typeName] ||= [];
 
         const { fields } = this.buildSelectionSet(schemaType, selectionNodes);
         const transformedSet = this.selectionSetStringFromFields(fields);

packages/presets/graphql-modules/src/builder.ts

@@ -378,9 +378,7 @@ export function buildModule(
     const name = node.name.value;
 
     if (node.fields) {
-      if (!picksObj[name]) {
-        picksObj[name] = [];
-      }
+      picksObj[name] ||= [];
 
       node.fields.forEach(field => {
         picksObj[name].push(field.name.value);
@@ -392,9 +390,7 @@ export function buildModule(
     const name = node.name.value;
 
     if (node.values) {
-      if (!picks.enums[name]) {
-        picks.enums[name] = [];
-      }
+      picks.enums[name] ||= [];
 
       node.values.forEach(field => {
         picks.enums[name].push(field.name.value);

packages/presets/graphql-modules/src/utils.ts

@@ -153,9 +153,7 @@ export function groupSourcesByModule(sources: Source[], basePath: string): Recor
       // PERF: we could guess the module by matching source.location with a list of already resolved paths
       const mod = extractModuleDirectory(source.location, basePath);
 
-      if (!grouped[mod]) {
-        grouped[mod] = [];
-      }
+      grouped[mod] ||= [];
 
       grouped[mod].push(source);
     }

packages/utils/plugins-helpers/src/federation.ts

@@ -271,9 +271,7 @@ export class ApolloFederation {
             .reduce((prev, curr) => [...prev, ...curr], []);
           const ofType = getBaseType(field.type);
 
-          if (!providesMap[ofType.name]) {
-            providesMap[ofType.name] = [];
-          }
+          providesMap[ofType.name] ||= [];
 
           providesMap[ofType.name].push(...provides);
         });

packages/utils/plugins-helpers/src/oldVisit.ts

@@ -13,13 +13,13 @@ export function oldVisit(
 ): any {
   if (typeof enterVisitors === 'object') {
     for (const key in enterVisitors) {
-      newVisitor[key] = newVisitor[key] || {};
+      newVisitor[key] ||= {};
       newVisitor[key].enter = enterVisitors[key];
     }
   }
   if (typeof leaveVisitors === 'object') {
     for (const key in leaveVisitors) {
-      newVisitor[key] = newVisitor[key] || {};
+      newVisitor[key] ||= {};
       newVisitor[key].leave = leaveVisitors[key];
     }
   }

scripts/match-graphql.js

@@ -8,6 +8,7 @@ const pkg = require(pkgPath);
 
 const version = argv[2];
 
+// eslint-disable-next-line logical-assignment-operators -- can be removed after drop support of Node.js 12
 pkg.resolutions = pkg.resolutions || {};
 if (pkg.resolutions.graphql.startsWith(version)) {
   // eslint-disable-next-line no-console