refactor the rule for readability

Author: tatomyr

packages/core/src/rules/common/__tests__/no-required-schema-properties-undefined.test.ts

@@ -46,7 +46,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'test' is undefined.",
+          "message": "Required property 'test' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -59,7 +59,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'test2' is undefined.",
+          "message": "Required property 'test2' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -108,7 +108,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'test' is undefined.",
+          "message": "Required property 'test' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -231,7 +231,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'foo' is undefined.",
+          "message": "Required property 'foo' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -286,7 +286,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'surname' is undefined.",
+          "message": "Required property 'surname' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -428,7 +428,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'test' is undefined.",
+          "message": "Required property 'test' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -536,12 +536,12 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'name' is undefined.",
+          "message": "Required property 'name' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
         },
-      ]  
+      ]
     `);
   });
 
@@ -648,7 +648,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'name' is undefined.",
+          "message": "Required property 'name' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -661,7 +661,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'huntingSkill' is undefined.",
+          "message": "Required property 'huntingSkill' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -757,7 +757,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'missing-required-prop' is undefined.",
+          "message": "Required property 'missing-required-prop' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -802,7 +802,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'missingRequired' is undefined.",
+          "message": "Required property 'missingRequired' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -850,7 +850,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'missing-required' is undefined.",
+          "message": "Required property 'missing-required' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],
@@ -890,7 +890,7 @@ describe('no-required-schema-properties-undefined', () => {
               "source": "foobar.yaml",
             },
           ],
-          "message": "Required property 'name' is undefined.",
+          "message": "Required property 'name' is not defined.",
           "ruleId": "no-required-schema-properties-undefined",
           "severity": "error",
           "suggest": [],

packages/core/src/rules/common/no-required-schema-properties-undefined.ts

@@ -23,7 +23,6 @@ export const NoRequiredSchemaPropertiesUndefined:
         parents.pop();
       },
       enter(schema: AnySchema, ctx: UserContext) {
-        const { location, report } = ctx;
         parents.push(schema);
         if (!schema.required) return;
 
@@ -38,21 +37,18 @@ export const NoRequiredSchemaPropertiesUndefined:
           visited.add(resolved.schema);
 
           if (
-            (resolved.schema.properties &&
-              getOwn(resolved.schema.properties, propertyName) !== undefined) ||
-            resolved.schema.allOf?.some((s) =>
-              hasProperty(s, propertyName, visited, resolved.location)
-            ) ||
-            resolved.schema.anyOf?.every((s) =>
-              hasProperty(s, propertyName, visited, resolved.location)
-            ) ||
-            resolved.schema.oneOf?.every((s) =>
-              hasProperty(s, propertyName, visited, resolved.location)
-            )
+            resolved.schema.properties &&
+            getOwn(resolved.schema.properties, propertyName) !== undefined
           ) {
             return true;
           }
 
+          const check = (s: AnySchema) => hasProperty(s, propertyName, visited, resolved.location);
+
+          if (resolved.schema.allOf?.some(check)) return true;
+          if (resolved.schema.anyOf?.every(check)) return true;
+          if (resolved.schema.oneOf?.every(check)) return true;
+
           return false;
         };
 
@@ -66,30 +62,24 @@ export const NoRequiredSchemaPropertiesUndefined:
         };
 
         const findCompositionRoot = (): AnySchema | undefined => {
-          let root: AnySchema | undefined;
-          let child = schema;
-          for (let i = parents.length - 2; i >= 0; i--) {
+          const walk = (i: number, child: AnySchema): AnySchema | undefined => {
+            if (i < 0) return undefined;
             const parent = parents[i];
-            if (isCompositionChild(parent, child)) {
-              root = parent;
-              child = parent;
-            } else {
-              break;
-            }
-          }
-          return root;
+            return isCompositionChild(parent, child) ? (walk(i - 1, parent) ?? parent) : undefined;
+          };
+          return walk(parents.length - 2, schema);
         };
 
         const compositionRoot = findCompositionRoot();
 
         for (const [i, requiredProperty] of schema.required.entries()) {
           if (
             !hasProperty(schema, requiredProperty, new Set()) &&
-            !(compositionRoot && hasProperty(compositionRoot, requiredProperty, new Set()))
+            !hasProperty(compositionRoot, requiredProperty, new Set())
           ) {
-            report({
-              message: `Required property '${requiredProperty}' is undefined.`,
-              location: location.child(['required', i]),
+            ctx.report({
+              message: `Required property '${requiredProperty}' is not defined.`,
+              location: ctx.location.child(['required', i]),
             });
           }
         }