aa

Author: dimaMachina

packages/plugin/src/rules/naming-convention/index.test.ts

@@ -259,27 +259,22 @@ ruleTester.run<RuleOptions>('naming-convention', rule, {
       ],
       errors: [
         {
-          message:
-            'Input "_idOperatorsFilterFindManyUserInput" should be in PascalCase format',
+          message: 'Input "_idOperatorsFilterFindManyUserInput" should be in PascalCase format',
         },
         {
           message: 'Input "_idOperatorsFilterFindOneUserInput" should be in PascalCase format',
         },
         {
-          message:
-            'Input "_idOperatorsFilterRemoveManyUserInput" should be in PascalCase format',
+          message: 'Input "_idOperatorsFilterRemoveManyUserInput" should be in PascalCase format',
         },
         {
-          message:
-            'Input "_idOperatorsFilterRemoveOneUserInput" should be in PascalCase format',
+          message: 'Input "_idOperatorsFilterRemoveOneUserInput" should be in PascalCase format',
         },
         {
-          message:
-            'Input "_idOperatorsFilterUpdateManyUserInput" should be in PascalCase format',
+          message: 'Input "_idOperatorsFilterUpdateManyUserInput" should be in PascalCase format',
         },
         {
-          message:
-            'Input "_idOperatorsFilterUpdateOneUserInput" should be in PascalCase format',
+          message: 'Input "_idOperatorsFilterUpdateOneUserInput" should be in PascalCase format',
         },
         { message: 'Input "_idOperatorsFilterUserInput" should be in PascalCase format' },
         { message: 'Enum value "male" should be in UPPER_CASE format' },
@@ -540,12 +535,14 @@ ruleTester.run<RuleOptions>('naming-convention', rule, {
     {
       name: 'requiredPattern',
       code: 'type Test { enabled: Boolean! }',
-      options: [{
-        'FieldDefinition[gqlType.gqlType.name.value=Boolean]': {
-          style: 'camelCase',
-          requiredPattern: ['^is', '^has'],
+      options: [
+        {
+          'FieldDefinition[gqlType.gqlType.name.value=Boolean]': {
+            style: 'camelCase',
+            requiredPattern: ['^is', '^has'],
+          },
         },
-       }],
+      ],
       errors: 1,
     },
   ],

packages/plugin/src/rules/naming-convention/index.ts

@@ -89,6 +89,26 @@ const schema = {
           description: 'Option to skip validation of some words, e.g. acronyms',
         },
       },
+      allOf: ['forbidden', 'required'].flatMap(name => [
+        {
+          not: {
+            properties: {
+              [`${name}Pattern`]: { type: 'array' },
+              [`${name}Prefixes`]: { type: 'array' },
+            },
+            required: [`${name}Pattern`, `${name}Prefixes`],
+          },
+        },
+        {
+          not: {
+            properties: {
+              [`${name}Pattern`]: { type: 'array' },
+              [`${name}Suffixes`]: { type: 'array' },
+            },
+            required: [`${name}Pattern`, `${name}Suffixes`],
+          },
+        },
+      ]),
     },
   },
   type: 'array',
@@ -364,7 +384,7 @@ export const rule: GraphQLESLintRule<RuleOptions> = {
         requiredPrefixes,
         requiredSuffixes,
         forbiddenPattern,
-        requiredPattern
+        requiredPattern,
       } = normalisePropertyOption(selector);
       const nodeName = node.value;
       const error = getError();
@@ -412,15 +432,10 @@ export const rule: GraphQLESLintRule<RuleOptions> = {
             renameToNames: [name.replace(new RegExp(forbidden), '')],
           };
         }
-        if (
-          requiredPattern &&
-          !requiredPattern.some(pattern => new RegExp(pattern).test(name))
-        ) {
+        if (requiredPattern && !requiredPattern.some(pattern => new RegExp(pattern).test(name))) {
           return {
-            errorMessage: `contain the required pattern: ${englishJoinWords(
-              requiredPattern,
-            )}`,
-            renameToNames: []
+            errorMessage: `contain the required pattern: ${englishJoinWords(requiredPattern)}`,
+            renameToNames: [],
           };
         }
         const forbiddenPrefix = forbiddenPrefixes?.find(prefix => name.startsWith(prefix));