@redocly/openapi-core 0.0.0-snapshot.1775468574 → 0.0.0-snapshot.1775489865

package/lib/rules/common/no-required-schema-properties-undefined.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-required-schema-properties-undefined.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-required-schema-properties-undefined.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAKjG,eAAO,MAAM,mCAAmC,EAC5C,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,UAAU,GACV,WAkGH,CAAC"}
+{"version":3,"file":"no-required-schema-properties-undefined.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-required-schema-properties-undefined.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AASjG,eAAO,MAAM,mCAAmC,EAC5C,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,UAAU,GACV,WA+EH,CAAC"}

package/lib/rules/common/no-required-schema-properties-undefined.js

@@ -1,5 +1,6 @@
-import { isRef } from '../../ref-utils.js';
 import { getOwn } from '../../utils/get-own.js';
+import { isNotEmptyArray } from '../../utils/is-not-empty-array.js';
+import { resolveSchema } from '../utils.js';
 export const NoRequiredSchemaPropertiesUndefined = () => {
     const parents = [];
     return {
@@ -7,67 +8,52 @@ export const NoRequiredSchemaPropertiesUndefined = () => {
             leave(_) {
                 parents.pop();
             },
-            enter(schema, { location, report, resolve }) {
-                parents.push(schema);
-                if (!schema.required)
+            enter(currentSchema, ctx) {
+                parents.push(currentSchema);
+                if (!currentSchema.required)
                     return;
-                const visitedSchemas = new Set();
-                const elevateProperties = (schema, from, includeFirstLevelExclusiveSchemas = true) => {
-                    // Check if the schema has been visited before processing it
-                    if (visitedSchemas.has(schema)) {
-                        return {};
+                const hasProperty = (schemaOrRef, propertyName, visited, resolveFrom) => {
+                    const { schema, location } = resolveSchema(schemaOrRef, ctx, resolveFrom);
+                    if (!schema || visited.has(schema))
+                        return false;
+                    visited.add(schema);
+                    if (schema.properties && getOwn(schema.properties, propertyName) !== undefined) {
+                        return true;
                     }
-                    visitedSchemas.add(schema);
-                    if (isRef(schema)) {
-                        const resolved = resolve(schema, from);
-                        if (!resolved.node) {
-                            return {};
-                        }
-                        return elevateProperties(resolved.node, resolved.location?.source.absoluteRef);
+                    if (schema.allOf?.some((s) => hasProperty(s, propertyName, visited, location))) {
+                        return true;
                     }
-                    return Object.assign({}, schema.properties, ...(schema.allOf?.map((s) => elevateProperties(s, from)) ?? []), ...(('anyOf' in schema && includeFirstLevelExclusiveSchemas
-                        ? schema.anyOf?.map((s) => elevateProperties(s, from))
-                        : undefined) ?? []), ...(('oneOf' in schema && includeFirstLevelExclusiveSchemas
-                        ? schema.oneOf?.map((s) => elevateProperties(s, from))
-                        : undefined) ?? []));
+                    if (isNotEmptyArray(schema.anyOf) &&
+                        schema.anyOf.every((s) => hasProperty(s, propertyName, new Set(visited), location))) {
+                        return true;
+                    }
+                    if (isNotEmptyArray(schema.oneOf) &&
+                        schema.oneOf.every((s) => hasProperty(s, propertyName, new Set(visited), location))) {
+                        return true;
+                    }
+                    return false;
                 };
-                /**
-                 * The index to use to lookup grand parent schemas when dealing with composed schemas.
-                 * @summary The current schema should always end up with under ../anyOf/1, if we get multiple ancestors, they should always be a multiple.
-                 */
-                const locationLookupIndex = 2;
-                const getParentSchema = (lookupIndex) => {
-                    lookupIndex++;
-                    if (!parents || parents.length < lookupIndex)
-                        return undefined;
-                    const parent = parents[parents.length - lookupIndex];
-                    return parent;
+                const isCompositionChild = (parent, child) => {
+                    const matchesChild = (s) => resolveSchema(s, ctx).schema === child;
+                    return !!(parent.allOf?.some(matchesChild) ||
+                        parent.anyOf?.some(matchesChild) ||
+                        parent.oneOf?.some(matchesChild));
                 };
-                const recursivelyGetParentProperties = (splitLocation, parentLookupIndex = 0) => {
-                    const isMemberOfComposedType = splitLocation.length > locationLookupIndex &&
-                        !isNaN(parseInt(splitLocation[splitLocation.length - 1])) &&
-                        !!/(allOf|oneOf|anyOf)/.exec(splitLocation[splitLocation.length - locationLookupIndex]);
-                    const parentSchema = isMemberOfComposedType
-                        ? getParentSchema(++parentLookupIndex)
-                        : undefined;
-                    const grandParentProperties = splitLocation.length >= locationLookupIndex + locationLookupIndex
-                        ? recursivelyGetParentProperties(splitLocation.slice(0, -locationLookupIndex), parentLookupIndex)
-                        : {};
-                    return parentSchema
-                        ? {
-                            ...elevateProperties(parentSchema, undefined, false),
-                            ...grandParentProperties,
-                        }
+                const findCompositionRoot = (i, child) => {
+                    if (i < 0)
+                        return undefined;
+                    const parent = parents[i];
+                    return isCompositionChild(parent, child)
+                        ? (findCompositionRoot(i - 1, parent) ?? parent)
                         : undefined;
                 };
-                const allProperties = elevateProperties(schema);
-                const parentProperties = recursivelyGetParentProperties(location.pointer.split('/'));
-                for (const [i, requiredProperty] of schema.required.entries()) {
-                    if ((!allProperties || getOwn(allProperties, requiredProperty) === undefined) &&
-                        (!parentProperties || getOwn(parentProperties, requiredProperty) === undefined)) {
-                        report({
-                            message: `Required property '${requiredProperty}' is undefined.`,
-                            location: location.child(['required', i]),
+                const compositionRoot = findCompositionRoot(parents.length - 2, currentSchema);
+                for (const [i, requiredProperty] of currentSchema.required.entries()) {
+                    if (!hasProperty(currentSchema, requiredProperty, new Set()) &&
+                        !hasProperty(compositionRoot, requiredProperty, new Set())) {
+                        ctx.report({
+                            message: `Required property '${requiredProperty}' is not defined.`,
+                            location: ctx.location.child(['required', i]),
                         });
                     }
                 }

package/lib/rules/common/no-required-schema-properties-undefined.js.map

@@ -1 +1 @@
-{"version":3,"file":"no-required-schema-properties-undefined.js","sourceRoot":"","sources":["../../../src/rules/common/no-required-schema-properties-undefined.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"no-required-schema-properties-undefined.js","sourceRoot":"","sources":["../../../src/rules/common/no-required-schema-properties-undefined.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "0.0.0-snapshot.1775468574",
+  "version": "0.0.0-snapshot.1775489865",
   "description": "",
   "type": "module",
   "types": "lib/index.d.ts",