@redocly/openapi-core 1.18.0 → 1.19.0

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/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-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-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/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-segment-plural.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathSegmentPlural = void 0;
+const pluralize = require("pluralize");
 const utils_1 = require("../../utils");
 const PathSegmentPlural = (opts) => {
     const { ignoreLastPathSegment, exceptions } = opts;
@@ -17,7 +18,7 @@ const PathSegmentPlural = (opts) => {
                     for (const pathSegment of pathSegments) {
                         if (exceptions && exceptions.includes(pathSegment))
                             continue;
-                        if (!(0, utils_1.isPathParameter)(pathSegment) && (0, utils_1.isSingular)(pathSegment)) {
+                        if (!(0, utils_1.isPathParameter)(pathSegment) && pluralize.isSingular(pathSegment)) {
                             report({
                                 message: `path segment \`${pathSegment}\` should be plural.`,
                                 location: location.key(),

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.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.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.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/no-unresolved-refs.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reportUnresolvedRef = exports.NoUnresolvedRefs = void 0;
+exports.NoUnresolvedRefs = void 0;
+exports.reportUnresolvedRef = reportUnresolvedRef;
 const resolve_1 = require("../resolve");
 const NoUnresolvedRefs = () => {
     return {
@@ -23,7 +24,6 @@ const NoUnresolvedRefs = () => {
 };
 exports.NoUnresolvedRefs = NoUnresolvedRefs;
 function reportUnresolvedRef(resolved, report, location) {
-    var _a;
     const error = resolved.error;
     if (error instanceof resolve_1.YamlParseError) {
         report({
@@ -38,10 +38,9 @@ function reportUnresolvedRef(resolved, report, location) {
             },
         });
     }
-    const message = (_a = resolved.error) === null || _a === void 0 ? void 0 : _a.message;
+    const message = resolved.error?.message;
     report({
         location,
         message: `Can't resolve $ref${message ? ': ' + message : ''}`,
     });
 }
-exports.reportUnresolvedRef = reportUnresolvedRef;

package/lib/rules/oas2/response-contains-property.js

@@ -15,7 +15,6 @@ const ResponseContainsProperty = (options) => {
                     key = ctx.key;
                 },
                 Schema(schema, { report, location }) {
-                    var _a;
                     if (schema.type !== 'object')
                         return;
                     const expectedProperties = names[key] ||
@@ -23,7 +22,7 @@ const ResponseContainsProperty = (options) => {
                         names[(0, utils_1.getMatchingStatusCodeRange)(key).toLowerCase()] ||
                         [];
                     for (const expectedProperty of expectedProperties) {
-                        if (!((_a = schema.properties) === null || _a === void 0 ? void 0 : _a[expectedProperty])) {
+                        if (!schema.properties?.[expectedProperty]) {
                             report({
                                 message: `Response object must contain a top-level "${expectedProperty}" property.`,
                                 location: location.child('properties').key(),

package/lib/rules/oas3/array-parameter-serialization.js

@@ -24,8 +24,7 @@ const ArrayParameterSerialization = (options) => {
 };
 exports.ArrayParameterSerialization = ArrayParameterSerialization;
 function shouldReportMissingStyleAndExplode(node, schema, options) {
-    var _a;
     return ((schema.type === 'array' || schema.items || schema.prefixItems) &&
         (node.style === undefined || node.explode === undefined) &&
-        (!options.in || (node.in && ((_a = options.in) === null || _a === void 0 ? void 0 : _a.includes(node.in)))));
+        (!options.in || (node.in && options.in?.includes(node.in))));
 }

package/lib/rules/oas3/component-name-unique.js

@@ -99,9 +99,8 @@ const ComponentNameUnique = (options) => {
         return componentName;
     }
     function addFoundComponent(typeName, componentName, absoluteLocation) {
-        var _a;
         const key = getKeyForComponent(typeName, componentName);
-        const locations = (_a = components.get(key)) !== null && _a !== void 0 ? _a : new Set();
+        const locations = components.get(key) ?? new Set();
         locations.add(absoluteLocation);
         components.set(key, locations);
     }
@@ -112,8 +111,7 @@ const ComponentNameUnique = (options) => {
 };
 exports.ComponentNameUnique = ComponentNameUnique;
 function getOptionComponentNameForTypeName(typeName) {
-    var _a;
-    return (_a = TYPE_NAME_TO_OPTION_COMPONENT_NAME[typeName]) !== null && _a !== void 0 ? _a : null;
+    return TYPE_NAME_TO_OPTION_COMPONENT_NAME[typeName] ?? null;
 }
 function getKeyForComponent(typeName, componentName) {
     return `${typeName}/${componentName}`;

package/lib/rules/oas3/no-invalid-media-type-examples.js

@@ -4,8 +4,7 @@ exports.ValidContentExamples = void 0;
 const ref_utils_1 = require("../../ref-utils");
 const utils_1 = require("../utils");
 const ValidContentExamples = (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 {
         MediaType: {
             leave(mediaType, ctx) {

package/lib/rules/oas3/no-server-variables-empty-enum.js

@@ -45,7 +45,6 @@ const NoServerVariablesEmptyEnum = () => {
 };
 exports.NoServerVariablesEmptyEnum = NoServerVariablesEmptyEnum;
 function checkEnumVariables(server) {
-    var _a;
     if (server.variables && Object.keys(server.variables).length === 0)
         return;
     const errors = [];
@@ -53,7 +52,7 @@ function checkEnumVariables(server) {
         const serverVariable = server.variables[variable];
         if (!serverVariable.enum)
             continue;
-        if (Array.isArray(serverVariable.enum) && ((_a = serverVariable.enum) === null || _a === void 0 ? void 0 : _a.length) === 0)
+        if (Array.isArray(serverVariable.enum) && serverVariable.enum?.length === 0)
             errors.push(enumError.empty);
         if (!serverVariable.default)
             continue;

package/lib/rules/oas3/no-undefined-server-variable.js

@@ -4,11 +4,10 @@ exports.NoUndefinedServerVariable = void 0;
 const NoUndefinedServerVariable = () => {
     return {
         Server(server, { report, location }) {
-            var _a;
             if (!server.url)
                 return;
-            const urlVariables = ((_a = server.url.match(/{[^}]+}/g)) === null || _a === void 0 ? void 0 : _a.map((e) => e.slice(1, e.length - 1))) || [];
-            const definedVariables = ((server === null || server === void 0 ? void 0 : server.variables) && Object.keys(server.variables)) || [];
+            const urlVariables = server.url.match(/{[^}]+}/g)?.map((e) => e.slice(1, e.length - 1)) || [];
+            const definedVariables = (server?.variables && Object.keys(server.variables)) || [];
             for (const serverVar of urlVariables) {
                 if (!definedVariables.includes(serverVar)) {
                     report({

package/lib/rules/oas3/no-unused-components.js

@@ -4,9 +4,8 @@ exports.NoUnusedComponents = void 0;
 const NoUnusedComponents = () => {
     const components = new Map();
     function registerComponent(location, name) {
-        var _a;
         components.set(location.absolutePointer, {
-            used: ((_a = components.get(location.absolutePointer)) === null || _a === void 0 ? void 0 : _a.used) || false,
+            used: components.get(location.absolutePointer)?.used || false,
             location,
             name,
         });

package/lib/rules/oas3/response-contains-property.js

@@ -16,7 +16,6 @@ const ResponseContainsProperty = (options) => {
                 },
                 MediaType: {
                     Schema(schema, { report, location }) {
-                        var _a;
                         if (schema.type !== 'object')
                             return;
                         const expectedProperties = names[key] ||
@@ -24,7 +23,7 @@ const ResponseContainsProperty = (options) => {
                             names[(0, utils_1.getMatchingStatusCodeRange)(key).toLowerCase()] ||
                             [];
                         for (const expectedProperty of expectedProperties) {
-                            if (!((_a = schema.properties) === null || _a === void 0 ? void 0 : _a[expectedProperty])) {
+                            if (!schema.properties?.[expectedProperty]) {
                                 report({
                                     message: `Response object must contain a top-level "${expectedProperty}" property.`,
                                     location: location.child('properties').key(),

package/lib/rules/utils.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateResponseCodes = exports.validateSchemaEnumType = exports.getAdditionalPropertiesOption = exports.validateExample = exports.getSuggest = exports.validateDefinedAndNonEmpty = exports.fieldNonEmpty = exports.missingRequiredField = exports.matchesJsonSchemaType = exports.oasTypeOf = void 0;
+exports.oasTypeOf = oasTypeOf;
+exports.matchesJsonSchemaType = matchesJsonSchemaType;
+exports.missingRequiredField = missingRequiredField;
+exports.fieldNonEmpty = fieldNonEmpty;
+exports.validateDefinedAndNonEmpty = validateDefinedAndNonEmpty;
+exports.getSuggest = getSuggest;
+exports.validateExample = validateExample;
+exports.getAdditionalPropertiesOption = getAdditionalPropertiesOption;
+exports.validateSchemaEnumType = validateSchemaEnumType;
+exports.validateResponseCodes = validateResponseCodes;
 const levenshtein = require("js-levenshtein");
 const ref_utils_1 = require("../ref-utils");
 const ajv_1 = require("./ajv");
@@ -19,7 +28,6 @@ function oasTypeOf(value) {
         return typeof value;
     }
 }
-exports.oasTypeOf = oasTypeOf;
 /**
  * Checks if value matches specified JSON schema type
  *
@@ -44,15 +52,12 @@ function matchesJsonSchemaType(value, type, nullable) {
             return typeof value === type;
     }
 }
-exports.matchesJsonSchemaType = matchesJsonSchemaType;
 function missingRequiredField(type, field) {
     return `${type} object should contain \`${field}\` field.`;
 }
-exports.missingRequiredField = missingRequiredField;
 function fieldNonEmpty(type, field) {
     return `${type} object \`${field}\` must be non-empty string.`;
 }
-exports.fieldNonEmpty = fieldNonEmpty;
 function validateDefinedAndNonEmpty(fieldName, value, ctx) {
     if (typeof value !== 'object') {
         return;
@@ -70,7 +75,6 @@ function validateDefinedAndNonEmpty(fieldName, value, ctx) {
         });
     }
 }
-exports.validateDefinedAndNonEmpty = validateDefinedAndNonEmpty;
 function getSuggest(given, variants) {
     if (given === null)
         return variants;
@@ -87,7 +91,6 @@ function getSuggest(given, variants) {
     // if (bestMatch.distance <= 4) return bestMatch.string;
     return distances.map((d) => d.variant);
 }
-exports.getSuggest = getSuggest;
 function validateExample(example, schema, dataLoc, { resolve, location, report }, allowAdditionalProperties) {
     try {
         const { valid, errors } = (0, ajv_1.validateJsonSchema)(example, schema, location.child('schema'), dataLoc.pointer, resolve, allowAdditionalProperties);
@@ -95,7 +98,10 @@ function validateExample(example, schema, dataLoc, { resolve, location, report }
             for (const error of errors) {
                 report({
                     message: `Example value must conform to the schema: ${error.message}.`,
-                    location: Object.assign(Object.assign({}, new ref_utils_1.Location(dataLoc.source, error.instancePath)), { reportOnKey: error.keyword === 'unevaluatedProperties' || error.keyword === 'additionalProperties' }),
+                    location: {
+                        ...new ref_utils_1.Location(dataLoc.source, error.instancePath),
+                        reportOnKey: error.keyword === 'unevaluatedProperties' || error.keyword === 'additionalProperties',
+                    },
                     from: location,
                     suggest: error.suggest,
                 });
@@ -113,7 +119,6 @@ function validateExample(example, schema, dataLoc, { resolve, location, report }
         });
     }
 }
-exports.validateExample = validateExample;
 function getAdditionalPropertiesOption(opts) {
     if (opts.disallowAdditionalProperties === undefined) {
         return opts.allowAdditionalProperties;
@@ -124,7 +129,6 @@ function getAdditionalPropertiesOption(opts) {
     (0, utils_1.showWarningForDeprecatedField)('disallowAdditionalProperties', 'allowAdditionalProperties');
     return !opts.disallowAdditionalProperties;
 }
-exports.getAdditionalPropertiesOption = getAdditionalPropertiesOption;
 function validateSchemaEnumType(schemaEnum, propertyValue, propName, refLocation, { report, location }) {
     if (!schemaEnum) {
         return;
@@ -140,7 +144,6 @@ function validateSchemaEnumType(schemaEnum, propertyValue, propName, refLocation
         });
     }
 }
-exports.validateSchemaEnumType = validateSchemaEnumType;
 function validateResponseCodes(responseCodes, codeRange, { report }) {
     const responseCodeRegexp = new RegExp(`^${codeRange[0]}[0-9Xx]{2}$`);
     const containsNeededCode = responseCodes.some((code) => (codeRange === '2XX' && code === 'default') || // It's OK to replace 2xx codes with the default
@@ -152,4 +155,3 @@ function validateResponseCodes(responseCodes, codeRange, { report }) {
         });
     }
 }
-exports.validateResponseCodes = validateResponseCodes;