chore: remove oneOf/anyOf/allOf separate rules and add one to handle different behavior

Author: AlbinaBlazhko17

packages/core/src/config/all.ts

@@ -117,8 +117,7 @@ const all: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'error',
     'tags-alphabetical': 'error',
     'no-duplicated-tag-names': 'error',
-    'no-illogical-one-of-usage': 'error',
-    'no-illogical-any-of-usage': 'error',
+    'no-illogical-composition-keywords': 'error',
   },
   oas3_1Rules: {
     'array-parameter-serialization': 'error',
@@ -181,8 +180,7 @@ const all: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'error',
     'tags-alphabetical': 'error',
     'no-duplicated-tag-names': 'error',
-    'no-illogical-one-of-usage': 'error',
-    'no-illogical-any-of-usage': 'error',
+    'no-illogical-composition-keywords': 'error',
   },
   oas3_2Rules: {
     'array-parameter-serialization': 'error',
@@ -245,8 +243,7 @@ const all: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'error',
     'tags-alphabetical': 'error',
     'no-duplicated-tag-names': 'error',
-    'no-illogical-one-of-usage': 'error',
-    'no-illogical-any-of-usage': 'error',
+    'no-illogical-composition-keywords': 'error',
   },
   async2Rules: {
     'channels-kebab-case': 'error',

packages/core/src/config/minimal.ts

@@ -108,8 +108,7 @@ const minimal: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'warn',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'off',
-    'no-illogical-one-of-usage': 'off',
-    'no-illogical-any-of-usage': 'off',
+    'no-illogical-composition-keywords': 'off',
   },
   oas3_1Rules: {
     'array-parameter-serialization': 'off',
@@ -166,8 +165,7 @@ const minimal: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'warn',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'off',
-    'no-illogical-one-of-usage': 'off',
-    'no-illogical-any-of-usage': 'off',
+    'no-illogical-composition-keywords': 'off',
   },
   oas3_2Rules: {
     'array-parameter-serialization': 'off',
@@ -224,8 +222,7 @@ const minimal: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'warn',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'off',
-    'no-illogical-one-of-usage': 'off',
-    'no-illogical-any-of-usage': 'off',
+    'no-illogical-composition-keywords': 'off',
   },
   async2Rules: {
     'channels-kebab-case': 'off',

packages/core/src/config/recommended-strict.ts

@@ -108,8 +108,7 @@ const recommendedStrict: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'error',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'error',
-    'no-illogical-one-of-usage': 'error',
-    'no-illogical-any-of-usage': 'error',
+    'no-illogical-composition-keywords': 'error',
   },
   oas3_1Rules: {
     'array-parameter-serialization': 'off',
@@ -166,8 +165,7 @@ const recommendedStrict: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'error',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'error',
-    'no-illogical-one-of-usage': 'error',
-    'no-illogical-any-of-usage': 'error',
+    'no-illogical-composition-keywords': 'error',
   },
   oas3_2Rules: {
     'array-parameter-serialization': 'off',
@@ -224,8 +222,7 @@ const recommendedStrict: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'error',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'error',
-    'no-illogical-one-of-usage': 'error',
-    'no-illogical-any-of-usage': 'error',
+    'no-illogical-composition-keywords': 'error',
   },
   async2Rules: {
     'channels-kebab-case': 'off',

packages/core/src/config/recommended.ts

@@ -108,8 +108,7 @@ const recommended: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'warn',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'warn',
-    'no-illogical-one-of-usage': 'warn',
-    'no-illogical-any-of-usage': 'warn',
+    'no-illogical-composition-keywords': 'warn',
   },
   oas3_1Rules: {
     'array-parameter-serialization': 'off',
@@ -166,8 +165,7 @@ const recommended: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'warn',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'warn',
-    'no-illogical-one-of-usage': 'warn',
-    'no-illogical-any-of-usage': 'warn',
+    'no-illogical-composition-keywords': 'warn',
   },
   oas3_2Rules: {
     'array-parameter-serialization': 'off',
@@ -224,8 +222,7 @@ const recommended: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'warn',
     'tags-alphabetical': 'off',
     'no-duplicated-tag-names': 'warn',
-    'no-illogical-one-of-usage': 'warn',
-    'no-illogical-any-of-usage': 'warn',
+    'no-illogical-composition-keywords': 'warn',
   },
   async2Rules: {
     'channels-kebab-case': 'off',

packages/core/src/config/spec.ts

@@ -108,8 +108,7 @@ const spec: RawGovernanceConfig<'built-in'> = {
     'tag-description': 'off',
     'tags-alphabetical': 'off',
     'nullable-type-sibling': 'error',
-    'no-illogical-one-of-usage': 'off',
-    'no-illogical-any-of-usage': 'off',
+    'no-illogical-composition-keywords': 'off',
   },
   oas3_1Rules: {
     'array-parameter-serialization': 'off',
@@ -166,8 +165,7 @@ const spec: RawGovernanceConfig<'built-in'> = {
     'spec-components-invalid-map-name': 'error',
     'tag-description': 'off',
     'tags-alphabetical': 'off',
-    'no-illogical-one-of-usage': 'error',
-    'no-illogical-any-of-usage': 'error',
+    'no-illogical-composition-keywords': 'error',
   },
   oas3_2Rules: {
     'array-parameter-serialization': 'off',
@@ -224,8 +222,7 @@ const spec: RawGovernanceConfig<'built-in'> = {
     'spec-components-invalid-map-name': 'error',
     'tag-description': 'off',
     'tags-alphabetical': 'off',
-    'no-illogical-one-of-usage': 'error',
-    'no-illogical-any-of-usage': 'error',
+    'no-illogical-composition-keywords': 'error',
   },
   async2Rules: {
     'channels-kebab-case': 'off',

packages/core/src/rules/oas3/index.ts

@@ -55,8 +55,7 @@ import { NoRequiredSchemaPropertiesUndefined } from '../common/no-required-schem
 import { NoSchemaTypeMismatch } from '../common/no-schema-type-mismatch.js';
 import { NoDuplicatedTagNames } from '../common/no-duplicated-tag-names.js';
 import { NullableTypeSibling } from './nullable-type-sibling.js';
-import { NoIllogicalOneOfUsage } from './no-illogical-one-of-usage.js';
-import { NoIllogicalAnyOfUsage } from './no-illogical-any-of-usage.js';
+import { NoIllogicalCompositionKeywords } from './no-illogical-composition-keywords.js';
 
 import type { Oas3RuleSet } from '../../oas-types.js';
 import type { Oas3Rule } from '../../visitors.js';
@@ -120,8 +119,7 @@ export const rules: Oas3RuleSet<'built-in'> = {
   'no-schema-type-mismatch': NoSchemaTypeMismatch as Oas3Rule,
   'no-duplicated-tag-names': NoDuplicatedTagNames as Oas3Rule,
   'nullable-type-sibling': NullableTypeSibling,
-  'no-illogical-one-of-usage': NoIllogicalOneOfUsage as Oas3Rule,
-  'no-illogical-any-of-usage': NoIllogicalAnyOfUsage as Oas3Rule,
+  'no-illogical-composition-keywords': NoIllogicalCompositionKeywords,
 };
 
 export const preprocessors = {};

packages/core/src/rules/oas3/no-illogical-any-of-usage.ts

@@ -22,7 +22,7 @@ type ReturnType = {
   reason?: string;
 };
 
-export const NoIllogicalOneOfUsage: Oas3Rule = (): Oas3Visitor => {
+export const NoIllogicalCompositionKeywords: Oas3Rule = (): Oas3Visitor => {
   return {
     Schema: {
       skip(node) {

…/rules/oas3/no-illogical-one-of-usage.ts …as3/no-illogical-composition-keywords.tspackages/core/src/rules/oas3/no-illogical-one-of-usage.ts renamed to packages/core/src/rules/oas3/no-illogical-composition-keywords.ts packages/core/src/rules/oas3/no-illogical-one-of-usage.ts renamed to packages/core/src/rules/oas3/no-illogical-composition-keywords.ts

@@ -114,8 +114,7 @@ const builtInOAS3Rules = [
   'array-parameter-serialization',
   'no-duplicated-tag-names',
   'nullable-type-sibling',
-  'no-illogical-one-of-usage',
-  'no-illogical-any-of-usage',
+  'no-illogical-composition-keywords',
 ] as const;
 
 export type BuiltInOAS3RuleId = typeof builtInOAS3Rules[number];