update GraphQL-ESLint to v4 in Schema Policies

.eslintrc.cjs

@@ -5,13 +5,6 @@ const guildConfig = require('@theguild/eslint-config/base');
 const { REACT_RESTRICTED_SYNTAX, RESTRICTED_SYNTAX } = require('@theguild/eslint-config/constants');
 const path = require('path');
 
-const SCHEMA_PATH = './packages/services/api/src/modules/*/module.graphql.ts';
-const OPERATIONS_PATHS = [
-  './packages/web/app/**/*.ts',
-  './packages/web/app/**/*.tsx',
-  './packages/web/app/**/*.graphql',
-];
-
 const rulesToExtends = Object.fromEntries(
   Object.entries(guildConfig.rules).filter(([key]) =>
     [
@@ -70,20 +63,25 @@ module.exports = {
       parser: '@graphql-eslint/eslint-plugin',
       plugins: ['@graphql-eslint'],
       parserOptions: {
-        schema: SCHEMA_PATH,
-        operations: OPERATIONS_PATHS,
+        graphQLConfig: {
+          schema: './packages/services/api/src/modules/*/module.graphql.ts',
+          documents: [
+            './packages/web/app/**/*.ts',
+            './packages/web/app/**/*.tsx',
+            './packages/web/app/**/*.graphql',
+          ],
+        },
       },
     },
     {
       // Setup processor for operations/fragments definitions on code-files
-      files: ['packages/web/app/**/*.tsx', 'packages/web/app/**/*.ts'],
+      files: ['packages/web/app/**/*.{ts,tsx}'],
       processor: '@graphql-eslint/graphql',
     },
     {
       files: ['packages/web/app/**/*.graphql'],
-      plugins: ['@graphql-eslint'],
       rules: {
-        '@graphql-eslint/require-id-when-available': 'error',
+        '@graphql-eslint/require-selections': 'error',
         '@graphql-eslint/no-deprecated': 'error',
       },
     },

package.json

@@ -65,10 +65,10 @@
     "@graphql-codegen/typescript-operations": "4.4.0",
     "@graphql-codegen/typescript-resolvers": "4.4.1",
     "@graphql-codegen/urql-introspection": "3.0.0",
-    "@graphql-eslint/eslint-plugin": "3.20.1",
+    "@graphql-eslint/eslint-plugin": "4.3.0",
     "@graphql-inspector/cli": "4.0.3",
     "@manypkg/get-packages": "2.2.2",
-    "@next/eslint-plugin-next": "14.2.23",
+    "@next/eslint-plugin-next": "15.0.4",
     "@parcel/watcher": "2.5.0",
     "@sentry/cli": "2.40.0",
     "@swc/core": "1.10.6",
@@ -121,8 +121,7 @@
       "[email protected]": "patches/[email protected]",
       "@apollo/[email protected]": "patches/@[email protected]",
       "@theguild/[email protected]": "patches/@[email protected]",
-      "[email protected]": "patches/[email protected]",
-      "@graphql-eslint/[email protected]": "patches/@[email protected]",
+      "eslint": "patches/eslint.patch",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "@oclif/[email protected]": "patches/@[email protected]",

packages/services/policy/package.json

@@ -9,15 +9,15 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.20.1",
+    "@graphql-eslint/eslint-plugin": "4.4.0-alpha-20241210124724-37546942474e54378c2b293d843e141891961747",
     "@hive/service-common": "workspace:*",
     "@sentry/node": "7.120.2",
     "@sentry/tracing": "7.114.0",
     "@trpc/server": "10.45.2",
-    "@types/eslint": "8.56.12",
+    "@types/eslint": "9.6.1",
     "ajv": "8.17.1",
     "dotenv": "16.4.7",
-    "eslint": "8.57.1",
+    "eslint": "9.23.0",
     "fastify": "4.29.0",
     "graphql": "16.9.0",
     "pino-pretty": "11.3.0",

packages/services/policy/src/api.ts

@@ -64,10 +64,10 @@ export const schemaPolicyApiRouter = t.router({
   availableRules: procedure.query(() => {
     return RELEVANT_RULES.map(([name, rule]) => ({
       name,
-      description: rule.meta.docs?.description || '',
-      recommended: rule.meta.docs?.recommended ?? false,
-      url: rule.meta.docs?.url,
-      schema: normalizeAjvSchema(rule.meta.schema) as object | null,
+      description: rule.meta!.docs!.description || '',
+      recommended: rule.meta!.docs!.recommended ?? false,
+      url: rule.meta!.docs!.url,
+      schema: normalizeAjvSchema(rule.meta!.schema),
     }));
   }),
   validateConfig: procedure.input(CONFIG_CHECK_INPUT_VALIDATION).query(() => {

packages/services/policy/src/policy.ts

@@ -1,7 +1,7 @@
 import Ajv from 'ajv';
 import { Linter } from 'eslint';
 import { z, ZodType } from 'zod';
-import { GraphQLESLintRule, parseForESLint, rules } from '@graphql-eslint/eslint-plugin';
+import { GraphQLESLintRule, parser, rules } from '@graphql-eslint/eslint-plugin/programmatic';
 import { RELEVANT_RULES } from './rules';
 
 const ajv = new Ajv({
@@ -12,24 +12,23 @@ const ajv = new Ajv({
   allowMatchingProperties: true,
 });
 const linter = new Linter();
-linter.defineParser('@graphql-eslint/eslint-plugin', { parseForESLint });
 
-for (const [ruleId, rule] of Object.entries(rules)) {
-  linter.defineRule(ruleId, rule as any);
-}
-
-const RULE_LEVEL = z.union([z.number().min(0).max(2), z.enum(['off', 'warn', 'error'])]);
+const RULE_LEVEL = z.union([
+  //
+  z.number().min(0).max(2),
+  z.enum(['off', 'warn', 'error']),
+]);
 
-type RulemapValidationType = {
+type RuleMapValidationType = {
   [RuleKey in keyof typeof rules]: ZodType;
 };
 
 export function normalizeAjvSchema(
-  schema: GraphQLESLintRule['meta']['schema'],
-): GraphQLESLintRule['meta']['schema'] {
+  schema: NonNullable<GraphQLESLintRule['meta']>['schema'],
+): NonNullable<GraphQLESLintRule['meta']>['schema'] {
   if (Array.isArray(schema)) {
     if (schema.length === 0) {
-      return null;
+      return;
     }
 
     return {
@@ -40,19 +39,19 @@ export function normalizeAjvSchema(
     };
   }
 
-  return schema || null;
+  return schema;
 }
 
 export function createInputValidationSchema() {
   return z
     .object(
       RELEVANT_RULES.reduce((acc, [name, rule]) => {
-        const schema = normalizeAjvSchema(rule.meta.schema);
+        const schema = normalizeAjvSchema(rule.meta!.schema);
         const validate = schema ? ajv.compile(schema) : null;
 
         return {
           ...acc,
-          [name]: z.union([
+          [`@graphql-eslint/${name}`]: z.union([
             z.tuple([RULE_LEVEL]),
             z.tuple(
               validate
@@ -77,7 +76,7 @@ export function createInputValidationSchema() {
             ),
           ]),
         };
-      }, {} as RulemapValidationType),
+      }, {} as RuleMapValidationType),
     )
     .required()
     .partial()
@@ -94,8 +93,18 @@ export async function schemaPolicyCheck(input: {
   return linter.verify(
     input.source,
     {
-      parser: '@graphql-eslint/eslint-plugin',
-      parserOptions: { schema: input.schema },
+      files: ['*.graphql'],
+      plugins: {
+        '@graphql-eslint': { rules },
+      },
+      languageOptions: {
+        parser,
+        parserOptions: {
+          graphQLConfig: {
+            schema: input.schema,
+          },
+        },
+      },
       rules: input.policy,
     },
     'schema.graphql',

packages/services/policy/src/rules.ts

@@ -1,58 +1,53 @@
-import { GraphQLESLintRule, rules, type CategoryType } from '@graphql-eslint/eslint-plugin';
+import {
+  GraphQLESLintRule,
+  rules,
+  type CategoryType,
+} from '@graphql-eslint/eslint-plugin/programmatic';
 
 type AllRulesType = typeof rules;
 type RuleName = keyof AllRulesType;
 
 const SKIPPED_RULES: RuleName[] = [
   // Skipped because in order to operate, it needs operations.
-  // Also it does not make sense to run it as part of a schema check.
+  // Also, it does not make sense to run it as part of a schema check.
   'no-unused-fields',
 ];
 
-function isRelevantCategory(category?: CategoryType | CategoryType[]): boolean {
-  if (!category) {
-    return false;
-  }
-
-  return Array.isArray(category) ? category.includes('Schema') : category === 'Schema';
+function isRelevantCategory(category: string): boolean {
+  return (category as CategoryType).includes('schema');
 }
 
 // Some rules have configurations for operations (like "alphabetize") and we do not want to expose them.
 function patchRulesConfig<T extends RuleName>(
   ruleName: T,
   ruleDef: AllRulesType[T],
 ): GraphQLESLintRule {
+  const { schema } = ruleDef.meta as any;
   switch (ruleName) {
     case 'alphabetize': {
       // Remove operation-specific configurations
-      delete ruleDef.meta.schema.items.properties.selections;
-      delete ruleDef.meta.schema.items.properties.variables;
+      delete schema.items.properties.selections;
+      delete schema.items.properties.variables;
       break;
     }
     case 'naming-convention': {
       // Remove operation-specific configurations
-      delete ruleDef.meta.schema.items.properties.VariableDefinition;
-      delete ruleDef.meta.schema.items.properties.OperationDefinition;
+      delete schema.items.properties.VariableDefinition;
+      delete schema.items.properties.OperationDefinition;
 
-      // Get rid of "definitions" references becuse it's breaking Monaco editor in the frontend
-      Object.entries(ruleDef.meta.schema.items.properties).forEach(([, propDef]) => {
+      // Get rid of "definitions" references because it's breaking Monaco editor in the frontend
+      Object.entries(schema.items.properties).forEach(([, propDef]) => {
         if (propDef && typeof propDef === 'object' && 'oneOf' in propDef) {
-          propDef.oneOf = [
-            ruleDef.meta.schema.definitions.asObject,
-            ruleDef.meta.schema.definitions.asString,
-          ];
+          propDef.oneOf = [schema.definitions.asObject, schema.definitions.asString];
         }
       });
-      ruleDef.meta.schema.items.patternProperties = {
+      schema.items.patternProperties = {
         '^(Argument|DirectiveDefinition|EnumTypeDefinition|EnumValueDefinition|FieldDefinition|InputObjectTypeDefinition|InputValueDefinition|InterfaceTypeDefinition|ObjectTypeDefinition|ScalarTypeDefinition|UnionTypeDefinition)(.+)?$':
           {
-            oneOf: [
-              ruleDef.meta.schema.definitions.asObject,
-              ruleDef.meta.schema.definitions.asString,
-            ],
+            oneOf: [schema.definitions.asObject, schema.definitions.asString],
           },
       };
-      delete ruleDef.meta.schema.definitions;
+      delete schema.definitions;
 
       break;
     }
@@ -68,8 +63,8 @@ function patchRulesConfig<T extends RuleName>(
 export const RELEVANT_RULES = Object.entries(rules)
   .filter(
     ([ruleName, rule]) =>
-      isRelevantCategory(rule.meta.docs?.category) &&
-      rule.meta.docs?.graphQLJSRuleName === undefined &&
+      isRelevantCategory(rule.meta!.docs!.category!) &&
+      rule.meta!.docs!.graphQLJSRuleName === undefined &&
       !SKIPPED_RULES.includes(ruleName as RuleName),
   )
   .map(

packages/web/app/src/components/organization/billing/Billing.tsx

@@ -17,6 +17,7 @@ const BillingView_OrganizationFragment = graphql(`
 const BillingView_QueryFragment = graphql(`
   fragment BillingView_QueryFragment on Query {
     billingPlans {
+      id
       planType
       ...PlanSummary_PlanFragment
     }

packages/web/app/src/components/organization/billing/PlanSummary.tsx

@@ -6,6 +6,7 @@ import { CurrencyFormatter } from './helpers';
 
 const PriceEstimationTable_PlanFragment = graphql(`
   fragment PriceEstimationTable_PlanFragment on BillingPlan {
+    id
     includedOperationsLimit
     pricePerOperationsUnit
     basePrice

packages/web/app/src/components/organization/billing/ProPlanBillingWarm.tsx

@@ -4,6 +4,7 @@ import { FragmentType, graphql, useFragment } from '@/gql';
 
 const ProPlanBilling_OrganizationFragment = graphql(`
   fragment ProPlanBilling_OrganizationFragment on Organization {
+    id
     billingConfiguration {
       hasPaymentIssues
     }

packages/web/app/src/components/organization/members/list.tsx

@@ -289,6 +289,7 @@ const OrganizationMembers_OrganizationFragment = graphql(`
       nodes {
         id
         user {
+          id
           displayName
         }
         role {

packages/web/app/src/components/project/settings/external-composition.tsx

@@ -63,12 +63,14 @@ const ExternalCompositionForm_EnableMutation = graphql(`
 
 const ExternalCompositionForm_OrganizationFragment = graphql(`
   fragment ExternalCompositionForm_OrganizationFragment on Organization {
+    id
     slug
   }
 `);
 
 const ExternalCompositionForm_ProjectFragment = graphql(`
   fragment ExternalCompositionForm_ProjectFragment on Project {
+    id
     slug
   }
 `);

packages/web/app/src/components/ui/user-menu.tsx

@@ -77,6 +77,7 @@ const UserMenu_MeFragment = graphql(`
 
 const UserMenu_MemberFragment = graphql(`
   fragment UserMenu_MemberFragment on Member {
+    id
     canLeaveOrganization
   }
 `);

packages/web/app/src/pages/organization-members.tsx

@@ -108,6 +108,7 @@ function PageContent(props: {
 const OrganizationMembersPageQuery = graphql(`
   query OrganizationMembersPageQuery($organizationSlug: String!) {
     organization: organizationBySlug(organizationSlug: $organizationSlug) {
+      id
       ...OrganizationMembersPage_OrganizationFragment
       viewerCanSeeMembers
     }

packages/web/app/src/pages/organization-settings.tsx

@@ -65,6 +65,7 @@ const DeleteGitHubIntegrationMutation = graphql(`
 
 const GitHubIntegrationSection_OrganizationFragment = graphql(`
   fragment GitHubIntegrationSection_OrganizationFragment on Organization {
+    id
     hasGitHubIntegration
     slug
   }
@@ -111,6 +112,7 @@ function GitHubIntegrationSection(props: {
 
 const SlackIntegrationSection_OrganizationFragment = graphql(`
   fragment SlackIntegrationSection_OrganizationFragment on Organization {
+    id
     hasSlackIntegration
     slug
   }