aa

Author: dimaMachina

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

@@ -529,7 +529,7 @@ ruleTester.run<RuleOptions>('naming-convention', rule, {
     {
       name: 'forbiddenPattern',
       code: 'query queryFoo { foo } query getBar { bar }',
-      options: [{ OperationDefinition: { forbiddenPattern: ['^get', '^query'] } }],
+      options: [{ OperationDefinition: { forbiddenPattern: [/^(get|query)/] } }],
       errors: 2,
     },
     {
@@ -539,7 +539,7 @@ ruleTester.run<RuleOptions>('naming-convention', rule, {
         {
           'FieldDefinition[gqlType.gqlType.name.value=Boolean]': {
             style: 'camelCase',
-            requiredPattern: ['^is', '^has'],
+            requiredPattern: [/^(is|has)/],
           },
         },
       ],

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

@@ -66,8 +66,20 @@ const schema = {
         style: { enum: ALLOWED_STYLES },
         prefix: { type: 'string' },
         suffix: { type: 'string' },
-        forbiddenPattern: ARRAY_DEFAULT_OPTIONS,
-        requiredPattern: ARRAY_DEFAULT_OPTIONS,
+        forbiddenPattern: {
+          ...ARRAY_DEFAULT_OPTIONS,
+          items: {
+            type: 'object',
+            description: 'RegEx',
+          },
+        },
+        requiredPattern: {
+          ...ARRAY_DEFAULT_OPTIONS,
+          items: {
+            type: 'object',
+            description: 'RegEx',
+          },
+        },
         forbiddenPrefixes: {
           ...ARRAY_DEFAULT_OPTIONS,
           description: descriptionPrefixesSuffixes('forbiddenPattern'),
@@ -158,8 +170,8 @@ type PropertySchema = {
   style?: AllowedStyle;
   suffix?: string;
   prefix?: string;
-  forbiddenPattern?: string[];
-  requiredPattern?: string[];
+  forbiddenPattern?: RegExp[];
+  requiredPattern?: RegExp[];
   forbiddenPrefixes?: string[];
   forbiddenSuffixes?: string[];
   requiredPrefixes?: string[];
@@ -423,18 +435,16 @@ export const rule: GraphQLESLintRule<RuleOptions> = {
             renameToNames: [name + suffix],
           };
         }
-        const forbidden = forbiddenPattern?.find((pattern: string) =>
-          new RegExp(pattern).test(name),
-        );
+        const forbidden = forbiddenPattern?.find(pattern => pattern.test(name));
         if (forbidden) {
           return {
             errorMessage: `not contain the forbidden pattern "${forbidden}"`,
-            renameToNames: [name.replace(new RegExp(forbidden), '')],
+            renameToNames: [name.replace(forbidden, '')],
           };
         }
-        if (requiredPattern && !requiredPattern.some(pattern => new RegExp(pattern).test(name))) {
+        if (requiredPattern && !requiredPattern.some(pattern => pattern.test(name))) {
           return {
-            errorMessage: `contain the required pattern: ${englishJoinWords(requiredPattern)}`,
+            errorMessage: `contain the required pattern: ${englishJoinWords(requiredPattern.map(re => re.source))}`,
             renameToNames: [],
           };
         }

packages/plugin/src/rules/naming-convention/snapshot.md

@@ -394,7 +394,7 @@ exports[`naming-convention > invalid > forbiddenPattern 1`] = `
 #### ❌ Error 1/2
 
     > 1 | query queryFoo { foo } query getBar { bar }
-        |       ^^^^^^^^ Query "queryFoo" should not contain the forbidden pattern "^query"
+        |       ^^^^^^^^ Query "queryFoo" should not contain the forbidden pattern "/^(get|query)/"
 
 #### 💡 Suggestion: Rename to \`Foo\`
 
@@ -403,7 +403,7 @@ exports[`naming-convention > invalid > forbiddenPattern 1`] = `
 #### ❌ Error 2/2
 
     > 1 | query queryFoo { foo } query getBar { bar }
-        |                              ^^^^^^ Query "getBar" should not contain the forbidden pattern "^get"
+        |                              ^^^^^^ Query "getBar" should not contain the forbidden pattern "/^(get|query)/"
 
 #### 💡 Suggestion: Rename to \`Bar\`
 
@@ -1994,7 +1994,7 @@ exports[`naming-convention > invalid > requiredPattern 1`] = `
 #### ❌ Error
 
     > 1 | type Test { enabled: Boolean! }
-        |             ^^^^^^^ Field "enabled" should contain the required pattern: ^is or ^has
+        |             ^^^^^^^ Field "enabled" should contain the required pattern: ^(is|has)
 `;
 
 exports[`naming-convention > invalid > schema-recommended config 1`] = `

website/content/rules/naming-convention.mdx

@@ -323,7 +323,9 @@ This element must be one of the following enum values:
 
 ### `forbiddenPattern` (array)
 
-The object is an array with all elements of the type `string`.
+The object is an array with all elements of the type `object`.
+
+The array object has the following properties:
 
 Additional restrictions:
 
@@ -332,7 +334,9 @@ Additional restrictions:
 
 ### `requiredPattern` (array)
 
-The object is an array with all elements of the type `string`.
+The object is an array with all elements of the type `object`.
+
+The array object has the following properties:
 
 Additional restrictions: