fix: exception level

Author: lovisaberggren

tools/spectral/ipa/__tests__/IPA125DiscriminatorMustAccompanyOneOfAnyOfAllOf.test.js

@@ -89,31 +89,31 @@ testRule('xgen-IPA-125-oneOf-must-accompany-oneOf-anyOf-allOf', [
           Schema: {
             discriminator: {
               propertyName: 'type',
-              'x-xgen-IPA-exception': {
-                'xgen-IPA-125-oneOf-must-accompany-oneOf-anyOf-allOf': 'reason',
-              },
             },
             properties: {
               type: {
                 type: 'string',
               },
             },
+            'x-xgen-IPA-exception': {
+              'xgen-IPA-125-oneOf-must-accompany-oneOf-anyOf-allOf': 'reason',
+            },
           },
           NestedSchema: {
             properties: {
               name: {
                 type: 'object',
                 discriminator: {
                   propertyName: 'first',
-                  'x-xgen-IPA-exception': {
-                    'xgen-IPA-125-oneOf-must-accompany-oneOf-anyOf-allOf': 'reason',
-                  },
                 },
                 properties: {
                   first: {
                     type: 'string',
                   },
                 },
+                'x-xgen-IPA-exception': {
+                  'xgen-IPA-125-oneOf-must-accompany-oneOf-anyOf-allOf': 'reason',
+                },
               },
               address: {
                 type: 'string',

tools/spectral/ipa/rulesets/functions/IPA125DiscriminatorMustAccompanyOneOfAnyOfAllOf.js

@@ -4,14 +4,14 @@ import { resolveObject } from './utils/componentUtils.js';
 const ERROR_MESSAGE = "Each discriminator property must be accompanied by a 'oneOf', 'anyOf' or 'allOf' property.";
 
 export default (input, _, { path, documentInventory, rule }) => {
-  const errors = checkViolationsAndReturnErrors(input, path, documentInventory.resolved);
-  return evaluateAndCollectAdoptionStatus(errors, rule.name, input, path);
-};
+  const siblings = resolveObject(documentInventory.resolved, path.slice(0, path.length - 1));
 
-function checkViolationsAndReturnErrors(input, path, oas) {
-  const siblings = Object.keys(resolveObject(oas, path.slice(0, path.length - 1)));
+  const errors = checkViolationsAndReturnErrors(input, path, Object.keys(siblings));
+  return evaluateAndCollectAdoptionStatus(errors, rule.name, siblings, path);
+};
 
-  if (!siblings.includes('oneOf') && !siblings.includes('anyOf') && !siblings.includes('allOf')) {
+function checkViolationsAndReturnErrors(input, path, siblingKeys) {
+  if (!siblingKeys.includes('oneOf') && !siblingKeys.includes('anyOf') && !siblingKeys.includes('allOf')) {
     return [
       {
         path,