@redocly/openapi-core 1.18.1 → 1.20.0

package/lib/rules/common/assertions/asserts.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAssertCustomFunction = exports.asserts = exports.runOnValuesSet = exports.runOnKeysSet = void 0;
+exports.asserts = exports.runOnValuesSet = exports.runOnKeysSet = void 0;
+exports.buildAssertCustomFunction = buildAssertCustomFunction;
 const utils_1 = require("../../../utils");
 const utils_2 = require("./utils");
 exports.runOnKeysSet = new Set([
@@ -41,7 +42,7 @@ exports.asserts = {
         const values = Array.isArray(value) ? value : [value];
         const regex = (0, utils_2.regexFromString)(condition);
         return values
-            .map((_val) => !(regex === null || regex === void 0 ? void 0 : regex.test(_val)) && {
+            .map((_val) => !regex?.test(_val) && {
             message: `"${_val}" should match a regex ${condition}`,
             location: (0, utils_1.isString)(value)
                 ? baseLocation
@@ -57,7 +58,7 @@ exports.asserts = {
         const values = Array.isArray(value) ? value : [value];
         const regex = (0, utils_2.regexFromString)(condition);
         return values
-            .map((_val) => (regex === null || regex === void 0 ? void 0 : regex.test(_val)) && {
+            .map((_val) => regex?.test(_val) && {
             message: `"${_val}" should not match a regex ${condition}`,
             location: (0, utils_1.isString)(value)
                 ? baseLocation
@@ -264,7 +265,7 @@ exports.asserts = {
                 ];
         }
         const regex = (0, utils_2.regexFromString)(condition);
-        const isValid = hasRef && (regex === null || regex === void 0 ? void 0 : regex.test(rawValue['$ref']));
+        const isValid = hasRef && regex?.test(rawValue['$ref']);
         return isValid
             ? []
             : [
@@ -278,4 +279,3 @@ exports.asserts = {
 function buildAssertCustomFunction(fn) {
     return (value, options, ctx) => fn.call(null, value, options, ctx);
 }
-exports.buildAssertCustomFunction = buildAssertCustomFunction;

package/lib/rules/common/assertions/index.d.ts

@@ -1,6 +1,6 @@
-import { asserts, AssertionFn } from './asserts';
-import { Oas2Visitor, Oas3Visitor } from '../../../visitors';
-import { RuleSeverity } from '../../../config';
+import type { asserts, AssertionFn } from './asserts';
+import type { ArazzoVisitor, Async2Visitor, Async3Visitor, Oas2Visitor, Oas3Visitor } from '../../../visitors';
+import type { RuleSeverity } from '../../../config';
 export type AssertionLocators = {
     filterInParentKeys?: (string | number)[];
     filterOutParentKeys?: (string | number)[];
@@ -24,4 +24,4 @@ export type RawAssertion = AssertionDefinition & {
 export type Assertion = RawAssertion & {
     assertionId: string;
 };
-export declare const Assertions: (opts: Record<string, Assertion>) => (Oas3Visitor | Oas2Visitor)[];
+export declare const Assertions: (opts: Record<string, Assertion>) => (Oas3Visitor | Oas2Visitor | Async2Visitor | Async3Visitor | ArazzoVisitor)[];

package/lib/rules/common/assertions/utils.d.ts

@@ -1,4 +1,4 @@
-import { Asserts } from './asserts';
+import type { Asserts } from './asserts';
 import type { AssertionContext, AssertResult } from '../../../config';
 import type { Assertion, AssertionDefinition } from '.';
 import type { Oas2Visitor, Oas3Visitor, VisitFunction } from '../../../visitors';

package/lib/rules/common/assertions/utils.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.regexFromString = exports.runAssertion = exports.isOrdered = exports.getIntersectionLength = exports.buildSubjectVisitor = exports.buildVisitorObject = exports.getAssertsToApply = void 0;
+exports.getAssertsToApply = getAssertsToApply;
+exports.buildVisitorObject = buildVisitorObject;
+exports.buildSubjectVisitor = buildSubjectVisitor;
+exports.getIntersectionLength = getIntersectionLength;
+exports.isOrdered = isOrdered;
+exports.runAssertion = runAssertion;
+exports.regexFromString = regexFromString;
 const asserts_1 = require("./asserts");
 const logger_1 = require("../../../logger");
 const ref_utils_1 = require("../../../ref-utils");
@@ -39,9 +45,8 @@ function getAssertsToApply(assertion) {
     }
     return assertsToApply;
 }
-exports.getAssertsToApply = getAssertsToApply;
 function getAssertionProperties({ subject }) {
-    return (Array.isArray(subject.property) ? subject.property : [subject === null || subject === void 0 ? void 0 : subject.property]).filter(Boolean);
+    return (Array.isArray(subject.property) ? subject.property : [subject?.property]).filter(Boolean);
 }
 function applyAssertions(assertionDefinition, asserts, ctx) {
     const properties = getAssertionProperties(assertionDefinition);
@@ -66,13 +71,15 @@ function applyAssertions(assertionDefinition, asserts, ctx) {
     return assertResults.flat();
 }
 function buildVisitorObject(assertion, subjectVisitor) {
-    var _a, _b;
     const targetVisitorLocatorPredicates = getPredicatesFromLocators(assertion.subject);
     const targetVisitorSkipFunction = targetVisitorLocatorPredicates.length
         ? (_, key) => !targetVisitorLocatorPredicates.every((predicate) => predicate(key))
         : undefined;
     const targetVisitor = {
-        [assertion.subject.type]: Object.assign({ enter: subjectVisitor }, (targetVisitorSkipFunction && { skip: targetVisitorSkipFunction })),
+        [assertion.subject.type]: {
+            enter: subjectVisitor,
+            ...(targetVisitorSkipFunction && { skip: targetVisitorSkipFunction }),
+        },
     };
     if (!Array.isArray(assertion.where)) {
         return targetVisitor;
@@ -82,37 +89,44 @@ function buildVisitorObject(assertion, subjectVisitor) {
     const context = assertion.where;
     for (let index = 0; index < context.length; index++) {
         const assertionDefinitionNode = context[index];
-        if (!(0, utils_1.isString)((_a = assertionDefinitionNode.subject) === null || _a === void 0 ? void 0 : _a.type)) {
+        if (!(0, utils_1.isString)(assertionDefinitionNode.subject?.type)) {
             throw new Error(`${assertion.assertionId} -> where -> [${index}]: 'type' (String) is required`);
         }
         const locatorPredicates = getPredicatesFromLocators(assertionDefinitionNode.subject);
         const assertsToApply = getAssertsToApply(assertionDefinitionNode);
         const skipFunction = (node, key, ctx) => !locatorPredicates.every((predicate) => predicate(key)) ||
-            !!applyAssertions(assertionDefinitionNode, assertsToApply, Object.assign(Object.assign({}, ctx), { node })).length;
-        const nodeVisitor = Object.assign({}, ((locatorPredicates.length || assertsToApply.length) && { skip: skipFunction }));
+            !!applyAssertions(assertionDefinitionNode, assertsToApply, { ...ctx, node }).length;
+        const nodeVisitor = {
+            ...((locatorPredicates.length || assertsToApply.length) && { skip: skipFunction }),
+        };
         if (assertionDefinitionNode.subject.type === assertion.subject.type &&
             index === context.length - 1) {
             // We have to merge the visitors if the last node inside the `where` is the same as the subject.
-            targetVisitor[assertion.subject.type] = Object.assign({ enter: subjectVisitor }, ((nodeVisitor.skip && { skip: nodeVisitor.skip }) ||
-                (targetVisitorSkipFunction && {
-                    skip: (node, key, ctx // We may have locators defined on assertion level and on where level for the same node type
-                    ) => { var _a; return !!(((_a = nodeVisitor.skip) === null || _a === void 0 ? void 0 : _a.call(nodeVisitor, node, key, ctx)) || (targetVisitorSkipFunction === null || targetVisitorSkipFunction === void 0 ? void 0 : targetVisitorSkipFunction(node, key))); },
-                })));
+            targetVisitor[assertion.subject.type] = {
+                enter: subjectVisitor,
+                ...((nodeVisitor.skip && { skip: nodeVisitor.skip }) ||
+                    (targetVisitorSkipFunction && {
+                        skip: (node, key, ctx // We may have locators defined on assertion level and on where level for the same node type
+                        ) => !!(nodeVisitor.skip?.(node, key, ctx) || targetVisitorSkipFunction?.(node, key)),
+                    })),
+            };
         }
         else {
-            currentVisitorLevel = currentVisitorLevel[(_b = assertionDefinitionNode.subject) === null || _b === void 0 ? void 0 : _b.type] =
+            currentVisitorLevel = currentVisitorLevel[assertionDefinitionNode.subject?.type] =
                 nodeVisitor;
         }
     }
     currentVisitorLevel[assertion.subject.type] = targetVisitor[assertion.subject.type];
     return visitor;
 }
-exports.buildVisitorObject = buildVisitorObject;
 function buildSubjectVisitor(assertId, assertion) {
     return (node, ctx) => {
         const properties = getAssertionProperties(assertion);
         const defaultMessage = `${logger_1.colorize.blue(assertId)} failed because the ${logger_1.colorize.blue(assertion.subject.type)} ${logger_1.colorize.blue(properties.join(', '))} didn't meet the assertions: ${assertionMessageTemplates.problems}`.replace(/ +/g, ' ');
-        const problems = applyAssertions(assertion, getAssertsToApply(assertion), Object.assign(Object.assign({}, ctx), { node }));
+        const problems = applyAssertions(assertion, getAssertsToApply(assertion), {
+            ...ctx,
+            node,
+        });
         if (problems.length) {
             for (const problemGroup of groupProblemsByPointer(problems)) {
                 const message = assertion.message || defaultMessage;
@@ -128,7 +142,6 @@ function buildSubjectVisitor(assertId, assertion) {
         }
     };
 }
-exports.buildSubjectVisitor = buildSubjectVisitor;
 function groupProblemsByPointer(problems) {
     const groups = {};
     for (const problem of problems) {
@@ -144,10 +157,9 @@ function getProblemsLocation(problems) {
     return problems.length ? problems[0].location : undefined;
 }
 function getProblemsMessage(problems) {
-    var _a;
     return problems.length === 1
-        ? (_a = problems[0].message) !== null && _a !== void 0 ? _a : ''
-        : problems.map((problem) => { var _a; return `\n- ${(_a = problem.message) !== null && _a !== void 0 ? _a : ''}`; }).join('');
+        ? problems[0].message ?? ''
+        : problems.map((problem) => `\n- ${problem.message ?? ''}`).join('');
 }
 function getIntersectionLength(keys, properties) {
     const props = new Set(properties);
@@ -159,7 +171,6 @@ function getIntersectionLength(keys, properties) {
     }
     return count;
 }
-exports.getIntersectionLength = getIntersectionLength;
 function isOrdered(value, options) {
     const direction = options.direction || options;
     const property = options.property;
@@ -186,26 +197,30 @@ function isOrdered(value, options) {
     }
     return true;
 }
-exports.isOrdered = isOrdered;
 function runAssertion({ assert, ctx, assertionProperty, }) {
-    var _a;
     const currentLocation = assert.name === 'ref' ? ctx.rawLocation : ctx.location;
     if (assertionProperty) {
         const values = (0, ref_utils_1.isRef)(ctx.node[assertionProperty])
-            ? (_a = ctx.resolve(ctx.node[assertionProperty])) === null || _a === void 0 ? void 0 : _a.node
+            ? ctx.resolve(ctx.node[assertionProperty])?.node
             : ctx.node[assertionProperty];
         const rawValues = ctx.rawNode[assertionProperty];
         const location = currentLocation.child(assertionProperty);
-        return asserts_1.asserts[assert.name](values, assert.conditions, Object.assign(Object.assign({}, ctx), { baseLocation: location, rawValue: rawValues }));
+        return asserts_1.asserts[assert.name](values, assert.conditions, {
+            ...ctx,
+            baseLocation: location,
+            rawValue: rawValues,
+        });
     }
     else {
         const value = Array.isArray(ctx.node) ? ctx.node : Object.keys(ctx.node);
-        return asserts_1.asserts[assert.name](value, assert.conditions, Object.assign(Object.assign({}, ctx), { rawValue: ctx.rawNode, baseLocation: currentLocation }));
+        return asserts_1.asserts[assert.name](value, assert.conditions, {
+            ...ctx,
+            rawValue: ctx.rawNode,
+            baseLocation: currentLocation,
+        });
     }
 }
-exports.runAssertion = runAssertion;
 function regexFromString(input) {
     const matches = input.match(/^\/(.*)\/(.*)|(.*)/);
     return matches && new RegExp(matches[1] || matches[3], matches[2]);
 }
-exports.regexFromString = regexFromString;

package/lib/rules/common/info-contact.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const InfoContact: Oas3Rule | Oas2Rule;

package/lib/rules/common/info-license-strict.d.ts

@@ -0,0 +1,2 @@
+import type { Oas3Rule, Oas2Rule, Async2Rule, Async3Rule } from '../../visitors';
+export declare const InfoLicenseStrict: Oas2Rule | Oas3Rule | Async2Rule | Async3Rule;

package/lib/rules/common/info-license-strict.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoLicenseStrict = void 0;
+const oas_types_1 = require("../../oas-types");
+const utils_1 = require("../utils");
+const InfoLicenseStrict = () => {
+    let specVersion;
+    return {
+        Root: {
+            enter(root) {
+                specVersion = (0, oas_types_1.detectSpec)(root);
+            },
+            License: {
+                leave(license, ctx) {
+                    if (specVersion === 'oas3_1') {
+                        (0, utils_1.validateOneOfDefinedAndNonEmpty)(['url', 'identifier'], license, ctx);
+                    }
+                    else {
+                        (0, utils_1.validateDefinedAndNonEmpty)('url', license, ctx);
+                    }
+                },
+            },
+        },
+    };
+};
+exports.InfoLicenseStrict = InfoLicenseStrict;

package/lib/rules/common/info-license-url.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const InfoLicenseUrl: Oas3Rule | Oas2Rule;

package/lib/rules/common/info-license.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const InfoLicense: Oas3Rule | Oas2Rule;

package/lib/rules/common/no-ambiguous-paths.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const NoAmbiguousPaths: Oas3Rule | Oas2Rule;

package/lib/rules/common/no-enum-type-mismatch.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const NoEnumTypeMismatch: Oas3Rule | Oas2Rule;

package/lib/rules/common/no-http-verbs-in-paths.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const NoHttpVerbsInPaths: Oas3Rule | Oas2Rule;

package/lib/rules/common/no-identical-paths.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const NoIdenticalPaths: Oas3Rule | Oas2Rule;

package/lib/rules/common/no-invalid-parameter-examples.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoInvalidParameterExamples = void 0;
 const utils_1 = require("../utils");
 const NoInvalidParameterExamples = (opts) => {
-    var _a;
-    const allowAdditionalProperties = (_a = (0, utils_1.getAdditionalPropertiesOption)(opts)) !== null && _a !== void 0 ? _a : false;
+    const allowAdditionalProperties = (0, utils_1.getAdditionalPropertiesOption)(opts) ?? false;
     return {
         Parameter: {
             leave(parameter, ctx) {

package/lib/rules/common/no-invalid-schema-examples.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoInvalidSchemaExamples = void 0;
 const utils_1 = require("../utils");
 const NoInvalidSchemaExamples = (opts) => {
-    var _a;
-    const allowAdditionalProperties = (_a = (0, utils_1.getAdditionalPropertiesOption)(opts)) !== null && _a !== void 0 ? _a : false;
+    const allowAdditionalProperties = (0, utils_1.getAdditionalPropertiesOption)(opts) ?? false;
     return {
         Schema: {
             leave(schema, ctx) {

package/lib/rules/common/no-path-trailing-slash.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const NoPathTrailingSlash: Oas3Rule | Oas2Rule;

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

@@ -1,2 +1,2 @@
-import { Oas2Rule, Oas3Rule } from '../../visitors';
+import type { Oas2Rule, Oas3Rule } from '../../visitors';
 export declare const NoRequiredSchemaPropertiesUndefined: Oas3Rule | Oas2Rule;

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

@@ -10,7 +10,6 @@ const NoRequiredSchemaPropertiesUndefined = () => {
                     return;
                 const visitedSchemas = new Set();
                 const elevateProperties = (schema) => {
-                    var _a, _b, _c, _d;
                     // Check if the schema has been visited before processing it
                     if (visitedSchemas.has(schema)) {
                         return {};
@@ -19,7 +18,7 @@ const NoRequiredSchemaPropertiesUndefined = () => {
                     if ((0, ref_utils_1.isRef)(schema)) {
                         return elevateProperties(resolve(schema).node);
                     }
-                    return Object.assign({}, schema.properties, ...((_b = (_a = schema.allOf) === null || _a === void 0 ? void 0 : _a.map(elevateProperties)) !== null && _b !== void 0 ? _b : []), ...((_d = (_c = schema.anyOf) === null || _c === void 0 ? void 0 : _c.map(elevateProperties)) !== null && _d !== void 0 ? _d : []));
+                    return Object.assign({}, schema.properties, ...(schema.allOf?.map(elevateProperties) ?? []), ...(schema.anyOf?.map(elevateProperties) ?? []));
                 };
                 const allProperties = elevateProperties(schema);
                 for (const [i, requiredProperty] of schema.required.entries()) {

package/lib/rules/common/operation-2xx-response.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const Operation2xxResponse: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-4xx-response.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const Operation4xxResponse: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-description.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const OperationDescription: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-operationId-unique.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const OperationIdUnique: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-operationId-url-safe.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const OperationIdUrlSafe: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-operationId-url-safe.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationIdUrlSafe = void 0;
+// eslint-disable-next-line no-useless-escape
 const validUrlSymbols = /^[A-Za-z0-9-._~:/?#\[\]@!\$&'()*+,;=]*$/;
 const OperationIdUrlSafe = () => {
     return {

package/lib/rules/common/operation-operationId.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const OperationOperationId: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-parameters-unique.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const OperationParametersUnique: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-singular-tag.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const OperationSingularTag: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-summary.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const OperationSummary: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-tag-defined.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const OperationTagDefined: Oas3Rule | Oas2Rule;

package/lib/rules/common/operation-tag-defined.js

@@ -5,8 +5,7 @@ const OperationTagDefined = () => {
     let definedTags;
     return {
         Root(root) {
-            var _a;
-            definedTags = new Set(((_a = root.tags) !== null && _a !== void 0 ? _a : []).map((t) => t.name));
+            definedTags = new Set((root.tags ?? []).map((t) => t.name));
         },
         Operation(operation, { report, location }) {
             if (operation.tags) {

package/lib/rules/common/parameter-description.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const ParameterDescription: Oas3Rule | Oas2Rule;

package/lib/rules/common/path-declaration-must-exist.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const PathDeclarationMustExist: Oas3Rule | Oas2Rule;

package/lib/rules/common/path-excludes-patterns.d.ts

@@ -1,2 +1,2 @@
-import { Oas2Rule, Oas3Rule } from '../../visitors';
+import type { Oas2Rule, Oas3Rule } from '../../visitors';
 export declare const PathExcludesPatterns: Oas3Rule | Oas2Rule;

package/lib/rules/common/path-http-verbs-order.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const PathHttpVerbsOrder: Oas3Rule | Oas2Rule;

package/lib/rules/common/path-http-verbs-order.js

@@ -16,7 +16,7 @@ const PathHttpVerbsOrder = (opts) => {
                 if (bIdx < aIdx) {
                     report({
                         message: 'Operation http verbs must be ordered.',
-                        location: Object.assign({ reportOnKey: true }, location.child(httpVerbs[i + 1])),
+                        location: { reportOnKey: true, ...location.child(httpVerbs[i + 1]) },
                     });
                 }
             }

package/lib/rules/common/path-not-include-query.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const PathNotIncludeQuery: Oas3Rule | Oas2Rule;

package/lib/rules/common/path-params-defined.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const PathParamsDefined: Oas3Rule | Oas2Rule;

package/lib/rules/common/path-segment-plural.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const PathSegmentPlural: Oas3Rule | Oas2Rule;

package/lib/rules/common/paths-kebab-case.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const PathsKebabCase: Oas3Rule | Oas2Rule;

package/lib/rules/common/required-string-property-missing-min-length.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule } from 'core/src/visitors';
+import type { Oas3Rule } from 'core/src/visitors';
 export declare const RequiredStringPropertyMissingMinLength: Oas3Rule;

package/lib/rules/common/required-string-property-missing-min-length.js

@@ -7,7 +7,7 @@ const RequiredStringPropertyMissingMinLength = () => {
     return {
         Schema: {
             enter(schema) {
-                if (!(schema === null || schema === void 0 ? void 0 : schema.required)) {
+                if (!schema?.required) {
                     skipSchemaProperties = true;
                     return;
                 }
@@ -21,7 +21,7 @@ const RequiredStringPropertyMissingMinLength = () => {
                 Schema: {
                     enter(schema, { key, location, report }) {
                         if (requiredPropertiesSet.has(key) && schema.type === 'string') {
-                            if (!(schema === null || schema === void 0 ? void 0 : schema.minLength)) {
+                            if (!schema?.minLength) {
                                 report({
                                     message: 'Property minLength is required.',
                                     location: location.key(),

package/lib/rules/common/response-contains-header.d.ts

@@ -1,2 +1,2 @@
-import { Oas2Rule, Oas3Rule } from '../../visitors';
+import type { Oas2Rule, Oas3Rule } from '../../visitors';
 export declare const ResponseContainsHeader: Oas3Rule | Oas2Rule;

package/lib/rules/common/response-contains-header.js

@@ -13,8 +13,8 @@ const ResponseContainsHeader = (options) => {
                         names[(0, utils_1.getMatchingStatusCodeRange)(key).toLowerCase()] ||
                         [];
                     for (const expectedHeader of expectedHeaders) {
-                        if (!(response === null || response === void 0 ? void 0 : response.headers) ||
-                            !Object.keys(response === null || response === void 0 ? void 0 : response.headers).some((header) => header.toLowerCase() === expectedHeader.toLowerCase())) {
+                        if (!response?.headers ||
+                            !Object.keys(response?.headers).some((header) => header.toLowerCase() === expectedHeader.toLowerCase())) {
                             report({
                                 message: `Response object must contain a "${expectedHeader}" header.`,
                                 location: location.child('headers').key(),

package/lib/rules/common/security-defined.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const SecurityDefined: Oas3Rule | Oas2Rule;

package/lib/rules/common/security-defined.js

@@ -52,13 +52,9 @@ const SecurityDefined = (opts) => {
                 path = key;
             },
             Operation(operation, { location, key }) {
-                var _a;
-                const isException = (_a = opts.exceptions) === null || _a === void 0 ? void 0 : _a.some((item) => {
-                    var _a;
-                    return item.path === path &&
-                        (!item.methods || ((_a = item.methods) === null || _a === void 0 ? void 0 : _a.some((method) => method.toLowerCase() === key)));
-                });
-                if (!(operation === null || operation === void 0 ? void 0 : operation.security) && !isException) {
+                const isException = opts.exceptions?.some((item) => item.path === path &&
+                    (!item.methods || item.methods?.some((method) => method.toLowerCase() === key)));
+                if (!operation?.security && !isException) {
                     eachOperationHasSecurity = false;
                     operationsWithoutSecurity.push(location);
                 }

package/lib/rules/common/spec-strict-refs.d.ts

@@ -1,2 +1,2 @@
-import { Oas2Rule, Oas3Rule } from '../../visitors';
+import type { Oas2Rule, Oas3Rule } from '../../visitors';
 export declare const SpecStrictRefs: Oas3Rule | Oas2Rule;

package/lib/rules/common/spec.d.ts

@@ -1,2 +1,2 @@
-import type { Oas3Rule, Oas2Rule, Async2Rule, ArazzoRule } from '../../visitors';
-export declare const Spec: Oas3Rule | Oas2Rule | Async2Rule | ArazzoRule;
+import type { Oas3Rule, Oas2Rule, Async2Rule, Async3Rule, ArazzoRule } from '../../visitors';
+export declare const Spec: Oas3Rule | Oas2Rule | Async2Rule | Async3Rule | ArazzoRule;

package/lib/rules/common/spec.js

@@ -8,7 +8,6 @@ const utils_2 = require("../../utils");
 const Spec = () => {
     return {
         any(node, { report, type, location, rawLocation, key, resolve, ignoreNextVisitorsOnNode }) {
-            var _a, _b, _c, _d, _e, _f;
             const nodeType = (0, utils_1.oasTypeOf)(node);
             const refLocation = rawLocation !== location ? rawLocation : undefined;
             if (type.items) {
@@ -42,7 +41,7 @@ const Spec = () => {
                     });
                 }
             }
-            const allowed = (_a = type.allowed) === null || _a === void 0 ? void 0 : _a.call(type, node);
+            const allowed = type.allowed?.(node);
             if (allowed && (0, utils_2.isPlainObject)(node)) {
                 for (const propName in node) {
                     if (allowed.includes(propName) ||
@@ -67,7 +66,7 @@ const Spec = () => {
                 }
                 if (!hasProperty)
                     report({
-                        message: `Must contain at least one of the following fields: ${(_b = type.requiredOneOf) === null || _b === void 0 ? void 0 : _b.join(', ')}.`,
+                        message: `Must contain at least one of the following fields: ${type.requiredOneOf?.join(', ')}.`,
                         from: refLocation,
                         location: [{ reportOnKey: true }],
                     });
@@ -102,9 +101,9 @@ const Spec = () => {
                 if (propSchema.resolvable !== false && (0, ref_utils_1.isRef)(propValue)) {
                     propValue = resolve(propValue).node;
                 }
-                if (propSchema.items && ((_c = propSchema.items) === null || _c === void 0 ? void 0 : _c.enum) && Array.isArray(propValue)) {
+                if (propSchema.items && propSchema.items?.enum && Array.isArray(propValue)) {
                     for (let i = 0; i < propValue.length; i++) {
-                        (0, utils_1.validateSchemaEnumType)((_d = propSchema.items) === null || _d === void 0 ? void 0 : _d.enum, propValue[i], propName, refLocation, {
+                        (0, utils_1.validateSchemaEnumType)(propSchema.items?.enum, propValue[i], propName, refLocation, {
                             report,
                             location: location.child([propName, i]),
                         });
@@ -124,8 +123,8 @@ const Spec = () => {
                     });
                     ignoreNextVisitorsOnNode();
                 }
-                else if (propValueType === 'array' && ((_e = propSchema.items) === null || _e === void 0 ? void 0 : _e.type)) {
-                    const itemsType = (_f = propSchema.items) === null || _f === void 0 ? void 0 : _f.type;
+                else if (propValueType === 'array' && propSchema.items?.type) {
+                    const itemsType = propSchema.items?.type;
                     for (let i = 0; i < propValue.length; i++) {
                         const item = propValue[i];
                         if (!(0, utils_1.matchesJsonSchemaType)(item, itemsType, false)) {

package/lib/rules/common/tag-description.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const TagDescription: Oas3Rule | Oas2Rule;

package/lib/rules/common/tags-alphabetical.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Rule, Oas2Rule } from '../../visitors';
+import type { Oas3Rule, Oas2Rule } from '../../visitors';
 export declare const TagsAlphabetical: Oas3Rule | Oas2Rule;