@redocly/openapi-core 1.3.0 → 1.4.1

package/lib/types/redocly-yaml.js

@@ -6,63 +6,78 @@ const theme_config_1 = require("./theme-config");
 const _1 = require(".");
 const oas3_1_1 = require("./oas3_1");
 const utils_1 = require("../utils");
-const builtInRulesList = [
+const builtInCommonRules = [
     'spec',
     'info-contact',
-    'info-license',
+    'operation-operationId',
+    'tag-description',
+    'tags-alphabetical',
+];
+const builtInCommonOASRules = [
     'info-license-url',
+    'info-license',
+    'no-ambiguous-paths',
+    'no-enum-type-mismatch',
+    'no-http-verbs-in-paths',
+    'no-identical-paths',
+    'no-invalid-parameter-examples',
+    'no-invalid-schema-examples',
+    'no-path-trailing-slash',
     'operation-2xx-response',
     'operation-4xx-response',
-    'operation-4xx-problem-details-rfc7807',
-    'assertions',
+    'operation-description',
     'operation-operationId-unique',
+    'operation-operationId-url-safe',
     'operation-parameters-unique',
-    'path-parameters-defined',
+    'operation-singular-tag',
+    'operation-summary',
     'operation-tag-defined',
-    'no-example-value-and-externalValue',
-    'no-enum-type-mismatch',
-    'no-path-trailing-slash',
-    'no-empty-servers',
+    'parameter-description',
     'path-declaration-must-exist',
-    'operation-operationId-url-safe',
-    'operation-operationId',
-    'operation-summary',
-    'tags-alphabetical',
-    'no-server-example.com',
-    'no-server-trailing-slash',
-    'tag-description',
-    'operation-description',
-    'no-unused-components',
+    'path-excludes-patterns',
+    'path-http-verbs-order',
     'path-not-include-query',
     'path-params-defined',
-    'parameter-description',
-    'operation-singular-tag',
+    'path-parameters-defined',
+    'path-segment-plural',
+    'paths-kebab-case',
+    'required-string-property-missing-min-length',
+    'response-contains-header',
+    'scalar-property-missing-example',
     'security-defined',
+    'spec-strict-refs',
     'no-unresolved-refs',
-    'paths-kebab-case',
+];
+const builtInOAS2Rules = [
     'boolean-parameter-prefixes',
-    'path-http-verbs-order',
+    'request-mime-type',
+    'response-contains-property',
+    'response-mime-type',
+];
+const builtInOAS3Rules = [
+    'boolean-parameter-prefixes',
+    'component-name-unique',
+    'no-empty-servers',
+    'no-example-value-and-externalValue',
     'no-invalid-media-type-examples',
-    'no-identical-paths',
-    'no-ambiguous-paths',
-    'no-undefined-server-variable',
+    'no-server-example.com',
+    'no-server-trailing-slash',
     'no-server-variables-empty-enum',
-    'no-http-verbs-in-paths',
-    'path-excludes-patterns',
+    'no-undefined-server-variable',
+    'no-unused-components',
+    'operation-4xx-problem-details-rfc7807',
     'request-mime-type',
-    'response-mime-type',
-    'path-segment-plural',
-    'no-invalid-schema-examples',
-    'no-invalid-parameter-examples',
-    'response-contains-header',
     'response-contains-property',
-    'scalar-property-missing-example',
+    'response-mime-type',
     'spec-components-invalid-map-name',
-    'required-string-property-missing-min-length',
-    'spec-strict-refs',
-    'component-name-unique',
-    'channels-kebab-case',
-    'no-channel-trailing-slash',
+];
+const builtInAsync2Rules = ['channels-kebab-case', 'no-channel-trailing-slash'];
+const builtInRules = [
+    ...builtInCommonRules,
+    ...builtInCommonOASRules,
+    ...builtInOAS2Rules,
+    ...builtInOAS3Rules,
+    ...builtInAsync2Rules,
 ];
 const nodeTypesList = [
     'any',
@@ -138,14 +153,17 @@ const ConfigStyleguide = {
         oas2Rules: 'Rules',
         oas3_0Rules: 'Rules',
         oas3_1Rules: 'Rules',
+        async2Rules: 'Rules',
         preprocessors: { type: 'object' },
         oas2Preprocessors: { type: 'object' },
         oas3_0Preprocessors: { type: 'object' },
         oas3_1Preprocessors: { type: 'object' },
+        async2Preprocessors: { type: 'object' },
         decorators: { type: 'object' },
         oas2Decorators: { type: 'object' },
         oas3_0Decorators: { type: 'object' },
         oas3_1Decorators: { type: 'object' },
+        async2Decorators: { type: 'object' },
     },
 };
 const RootConfigStyleguide = {
@@ -208,7 +226,7 @@ const Rules = {
             // keep the old assert/ prefix as an alias
             return 'Assert';
         }
-        else if (builtInRulesList.includes(key) || utils_1.isCustomRuleId(key)) {
+        else if (builtInRules.includes(key) || (0, utils_1.isCustomRuleId)(key)) {
             if (typeof value === 'string') {
                 return { enum: ['error', 'warn', 'off'] };
             }
@@ -309,7 +327,7 @@ const Assert = {
     properties: {
         subject: 'AssertionDefinitionSubject',
         assertions: 'AssertionDefinitionAssertions',
-        where: _1.listOf('AssertDefinition'),
+        where: (0, _1.listOf)('AssertDefinition'),
         message: { type: 'string' },
         suggest: { type: 'array', items: { type: 'string' } },
         severity: { enum: ['error', 'warn', 'off'] },
@@ -357,8 +375,8 @@ const ConfigLabels = {
 };
 const ConfigSidebarLinks = {
     properties: {
-        beforeInfo: _1.listOf('CommonConfigSidebarLinks'),
-        end: _1.listOf('CommonConfigSidebarLinks'),
+        beforeInfo: (0, _1.listOf)('CommonConfigSidebarLinks'),
+        end: (0, _1.listOf)('CommonConfigSidebarLinks'),
     },
 };
 const CommonConfigSidebarLinks = {
@@ -386,7 +404,7 @@ const CommonColorProps = {
     },
 };
 const BorderThemeColors = {
-    properties: utils_1.pickObjectProps(CommonThemeColors.properties, ['light', 'dark']),
+    properties: (0, utils_1.pickObjectProps)(CommonThemeColors.properties, ['light', 'dark']),
 };
 const HttpColors = {
     properties: {
@@ -410,7 +428,7 @@ const ResponseColors = {
     },
 };
 const SecondaryColors = {
-    properties: utils_1.omitObjectProps(CommonThemeColors.properties, ['dark']),
+    properties: (0, utils_1.omitObjectProps)(CommonThemeColors.properties, ['dark']),
 };
 const TextThemeColors = {
     properties: {
@@ -458,10 +476,10 @@ const FontConfig = {
     },
 };
 const ButtonsConfig = {
-    properties: Object.assign(Object.assign({}, utils_1.omitObjectProps(FontConfig.properties, ['fontSize', 'lineHeight'])), { borderRadius: { type: 'string' }, hoverStyle: { type: 'string' }, boxShadow: { type: 'string' }, hoverBoxShadow: { type: 'string' }, sizes: 'Sizes' }),
+    properties: Object.assign(Object.assign({}, (0, utils_1.omitObjectProps)(FontConfig.properties, ['fontSize', 'lineHeight'])), { borderRadius: { type: 'string' }, hoverStyle: { type: 'string' }, boxShadow: { type: 'string' }, hoverBoxShadow: { type: 'string' }, sizes: 'Sizes' }),
 };
 const BadgeFontConfig = {
-    properties: utils_1.pickObjectProps(FontConfig.properties, ['fontSize', 'lineHeight']),
+    properties: (0, utils_1.pickObjectProps)(FontConfig.properties, ['fontSize', 'lineHeight']),
 };
 const BadgeSizes = {
     properties: {
@@ -470,7 +488,7 @@ const BadgeSizes = {
     },
 };
 const HttpBadgesConfig = {
-    properties: Object.assign(Object.assign({}, utils_1.omitObjectProps(FontConfig.properties, ['fontSize', 'lineHeight'])), { borderRadius: { type: 'string' }, color: { type: 'string' }, sizes: 'BadgeSizes' }),
+    properties: Object.assign(Object.assign({}, (0, utils_1.omitObjectProps)(FontConfig.properties, ['fontSize', 'lineHeight'])), { borderRadius: { type: 'string' }, color: { type: 'string' }, sizes: 'BadgeSizes' }),
 };
 const LabelControls = {
     properties: {
@@ -556,7 +574,7 @@ const GroupItemsConfig = {
     },
 };
 const Level1Items = {
-    properties: utils_1.pickObjectProps(GroupItemsConfig.properties, ['textTransform']),
+    properties: (0, utils_1.pickObjectProps)(GroupItemsConfig.properties, ['textTransform']),
 };
 const SpacingConfig = {
     properties: {
@@ -569,7 +587,7 @@ const SpacingConfig = {
     },
 };
 const Sidebar = {
-    properties: Object.assign(Object.assign({}, utils_1.omitObjectProps(FontConfig.properties, ['fontWeight', 'lineHeight'])), { activeBgColor: { type: 'string' }, activeTextColor: { type: 'string' }, backgroundColor: { type: 'string' }, borderRadius: { type: 'string' }, breakPath: { type: 'boolean' }, caretColor: { type: 'string' }, caretSize: { type: 'string' }, groupItems: 'GroupItemsConfig', level1items: 'Level1Items', rightLineColor: { type: 'string' }, separatorLabelColor: { type: 'string' }, showAtBreakpoint: { type: 'string' }, spacing: 'SpacingConfig', textColor: { type: 'string' }, width: { type: 'string' } }),
+    properties: Object.assign(Object.assign({}, (0, utils_1.omitObjectProps)(FontConfig.properties, ['fontWeight', 'lineHeight'])), { activeBgColor: { type: 'string' }, activeTextColor: { type: 'string' }, backgroundColor: { type: 'string' }, borderRadius: { type: 'string' }, breakPath: { type: 'boolean' }, caretColor: { type: 'string' }, caretSize: { type: 'string' }, groupItems: 'GroupItemsConfig', level1items: 'Level1Items', rightLineColor: { type: 'string' }, separatorLabelColor: { type: 'string' }, showAtBreakpoint: { type: 'string' }, spacing: 'SpacingConfig', textColor: { type: 'string' }, width: { type: 'string' } }),
 };
 const Heading = {
     properties: Object.assign(Object.assign({}, FontConfig.properties), { color: { type: 'string' }, transform: { type: 'string' } }),
@@ -589,7 +607,7 @@ const CodeConfig = {
         }, wrap: { type: 'boolean' } }),
 };
 const HeadingsConfig = {
-    properties: utils_1.omitObjectProps(FontConfig.properties, ['fontSize']),
+    properties: (0, utils_1.omitObjectProps)(FontConfig.properties, ['fontSize']),
 };
 const LinksConfig = {
     properties: {
@@ -601,10 +619,10 @@ const LinksConfig = {
     },
 };
 const Typography = {
-    properties: Object.assign(Object.assign({ code: 'CodeConfig', fieldName: 'FontConfig' }, utils_1.pickObjectProps(FontConfig.properties, ['fontSize', 'fontFamily'])), { fontWeightBold: { type: 'string' }, fontWeightLight: { type: 'string' }, fontWeightRegular: { type: 'string' }, heading1: 'Heading', heading2: 'Heading', heading3: 'Heading', headings: 'HeadingsConfig', lineHeight: { type: 'string' }, links: 'LinksConfig', optimizeSpeed: { type: 'boolean' }, rightPanelHeading: 'Heading', smoothing: { enum: ['auto', 'none', 'antialiased', 'subpixel-antialiased', 'grayscale'] } }),
+    properties: Object.assign(Object.assign({ code: 'CodeConfig', fieldName: 'FontConfig' }, (0, utils_1.pickObjectProps)(FontConfig.properties, ['fontSize', 'fontFamily'])), { fontWeightBold: { type: 'string' }, fontWeightLight: { type: 'string' }, fontWeightRegular: { type: 'string' }, heading1: 'Heading', heading2: 'Heading', heading3: 'Heading', headings: 'HeadingsConfig', lineHeight: { type: 'string' }, links: 'LinksConfig', optimizeSpeed: { type: 'boolean' }, rightPanelHeading: 'Heading', smoothing: { enum: ['auto', 'none', 'antialiased', 'subpixel-antialiased', 'grayscale'] } }),
 };
 const TokenProps = {
-    properties: Object.assign({ color: { type: 'string' } }, utils_1.omitObjectProps(FontConfig.properties, ['fontWeight'])),
+    properties: Object.assign({ color: { type: 'string' } }, (0, utils_1.omitObjectProps)(FontConfig.properties, ['fontWeight'])),
 };
 const CodeBlock = {
     properties: {
@@ -680,7 +698,7 @@ const ConfigTheme = {
 const GenerateCodeSamples = {
     properties: {
         skipOptionalParameters: { type: 'boolean' },
-        languages: _1.listOf('ConfigLanguage'),
+        languages: (0, _1.listOf)('ConfigLanguage'),
     },
     required: ['languages'],
 };

package/lib/types/theme-config.js

@@ -596,4 +596,4 @@ var ScorecardStatus;
     ScorecardStatus["BelowMinimum"] = "Below minimum";
     ScorecardStatus["Highest"] = "Highest";
     ScorecardStatus["Minimum"] = "Minimum";
-})(ScorecardStatus = exports.ScorecardStatus || (exports.ScorecardStatus = {}));
+})(ScorecardStatus || (exports.ScorecardStatus = ScorecardStatus = {}));

package/lib/typings/common.d.ts

@@ -4,5 +4,5 @@ export interface StatsRow {
     color: 'red' | 'yellow' | 'green' | 'white' | 'magenta' | 'cyan';
     items?: Set<string>;
 }
-export declare type StatsName = 'operations' | 'refs' | 'tags' | 'externalDocs' | 'pathItems' | 'links' | 'schemas' | 'parameters';
-export declare type StatsAccumulator = Record<StatsName, StatsRow>;
+export type StatsName = 'operations' | 'refs' | 'tags' | 'externalDocs' | 'pathItems' | 'links' | 'schemas' | 'parameters';
+export type StatsAccumulator = Record<StatsName, StatsRow>;

package/lib/typings/openapi.d.ts

@@ -35,7 +35,7 @@ export interface Oas3Paths {
 export interface OasRef {
     $ref: string;
 }
-export declare type Referenced<T> = OasRef | T;
+export type Referenced<T> = OasRef | T;
 export interface Oas3PathItem {
     summary?: string;
     description?: string;
@@ -147,7 +147,7 @@ export interface Oas3Schema {
     xml?: Oas3Xml;
     'x-tags'?: string[];
 }
-export declare type Oas3_1Schema = Oas3Schema & {
+export type Oas3_1Schema = Oas3Schema & {
     type?: string | string[];
     examples?: any[];
 };
@@ -183,8 +183,8 @@ export interface Oas3Encoding {
     explode: boolean;
     allowReserved: boolean;
 }
-export declare type Oas3ParameterLocation = 'query' | 'header' | 'path' | 'cookie';
-export declare type Oas3ParameterStyle = 'matrix' | 'label' | 'form' | 'simple' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+export type Oas3ParameterLocation = 'query' | 'header' | 'path' | 'cookie';
+export type Oas3ParameterStyle = 'matrix' | 'label' | 'form' | 'simple' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
 export interface Oas3RequestBody {
     description?: string;
     required?: boolean;
@@ -210,7 +210,7 @@ export interface Oas3Response {
 export interface Oas3Link {
     $ref?: string;
 }
-export declare type Oas3Header = Omit<Oas3Parameter, 'in' | 'name'>;
+export type Oas3Header = Omit<Oas3Parameter, 'in' | 'name'>;
 export interface Oas3Callback {
     [name: string]: Oas3PathItem;
 }
@@ -243,7 +243,7 @@ export interface Oas3Components {
         [name: string]: Referenced<Oas3Callback>;
     };
 }
-export declare type Oas3ComponentName = keyof Oas3Components;
+export type Oas3ComponentName = keyof Oas3Components;
 export interface Oas3SecurityRequirement {
     [name: string]: string[];
 }

package/lib/typings/swagger.d.ts

@@ -73,7 +73,7 @@ export interface Oas2Operation {
     'x-code-samples'?: Oas2XCodeSample[];
     'x-hideTryItPanel'?: boolean;
 }
-export declare type Oas2Parameter = Oas2BodyParameter | Oas2SimpleParameter;
+export type Oas2Parameter = Oas2BodyParameter | Oas2SimpleParameter;
 export interface Oas2BodyParameter {
     name: string;
     in: 'body';
@@ -169,11 +169,11 @@ export interface Oas2Schema {
     xml?: Oas2Xml;
     'x-tags'?: string[];
 }
-export declare type Oas2ParameterLocation = 'query' | 'header' | 'path' | 'formData';
+export type Oas2ParameterLocation = 'query' | 'header' | 'path' | 'formData';
 export interface Oas2Responses {
     [code: string]: Oas2Response;
 }
-export declare type Oas2Header = Oas2Items & {
+export type Oas2Header = Oas2Items & {
     description?: 'string';
 };
 export interface Oas2Response {

package/lib/utils.d.ts

@@ -1,18 +1,18 @@
 import { UserContext } from './walk';
 import { HttpResolveConfig } from './config';
 export { parseYaml, stringifyYaml } from './js-yaml';
-export declare type StackFrame<T> = {
+export type StackFrame<T> = {
     prev: StackFrame<T> | null;
     value: T;
 };
-export declare type Stack<T> = StackFrame<T> | null;
-export declare type StackNonEmpty<T> = StackFrame<T>;
+export type Stack<T> = StackFrame<T> | null;
+export type StackNonEmpty<T> = StackFrame<T>;
 export declare function pushStack<T, P extends Stack<T> = Stack<T>>(head: P, value: T): {
     prev: P;
     value: T;
 };
 export declare function popStack<T, P extends Stack<T>>(head: P): StackFrame<T> | null;
-export declare type BundleOutputFormat = 'json' | 'yml' | 'yaml';
+export type BundleOutputFormat = 'json' | 'yml' | 'yaml';
 export declare function loadYaml<T>(filename: string): Promise<T>;
 export declare function isDefined<T>(x: T | undefined): x is T;
 export declare function isPlainObject(value: any): value is object;
@@ -44,7 +44,7 @@ export declare function isCustomRuleId(id: string): boolean;
 export declare function doesYamlFileExist(filePath: string): boolean;
 export declare function showWarningForDeprecatedField(deprecatedField: string, updatedField?: string, updatedObject?: string): void;
 export declare function showErrorForDeprecatedField(deprecatedField: string, updatedField?: string, updatedObject?: string): void;
-export declare type Falsy = undefined | null | false | '' | 0;
+export type Falsy = undefined | null | false | '' | 0;
 export declare function isTruthy<Truthy>(value: Truthy | Falsy): value is Truthy;
 export declare function identity<T>(value: T): T;
 export declare function keysOf<T>(obj: T): (keyof T)[];

package/lib/utils.js

@@ -33,7 +33,7 @@ exports.popStack = popStack;
 function loadYaml(filename) {
     return __awaiter(this, void 0, void 0, function* () {
         const contents = yield fs.promises.readFile(filename, 'utf-8');
-        return js_yaml_1.parseYaml(contents);
+        return (0, js_yaml_1.parseYaml)(contents);
     });
 }
 exports.loadYaml = loadYaml;
@@ -141,7 +141,7 @@ function readFileAsStringSync(filePath) {
 exports.readFileAsStringSync = readFileAsStringSync;
 function yamlAndJsonSyncReader(filePath) {
     const content = fs.readFileSync(filePath, 'utf-8');
-    return js_yaml_1.parseYaml(content);
+    return (0, js_yaml_1.parseYaml)(content);
 }
 exports.yamlAndJsonSyncReader = yamlAndJsonSyncReader;
 function isPathParameter(pathSegment) {
@@ -189,7 +189,7 @@ function isCustomRuleId(id) {
 }
 exports.isCustomRuleId = isCustomRuleId;
 function doesYamlFileExist(filePath) {
-    return ((path_1.extname(filePath) === '.yaml' || path_1.extname(filePath) === '.yml') &&
+    return (((0, path_1.extname)(filePath) === '.yaml' || (0, path_1.extname)(filePath) === '.yml') &&
         fs.hasOwnProperty('existsSync') &&
         fs.existsSync(filePath));
 }

package/lib/visitors.d.ts

@@ -5,20 +5,20 @@ import type { Stack } from './utils';
 import type { UserContext, ResolveResult, ProblemSeverity } from './walk';
 import type { Location } from './ref-utils';
 import { Async2Definition } from './typings/asyncapi';
-export declare type SkipFunctionContext = Pick<UserContext, 'location' | 'rawNode' | 'resolve' | 'rawLocation'>;
-export declare type VisitFunction<T> = (node: T, ctx: UserContext & {
+export type SkipFunctionContext = Pick<UserContext, 'location' | 'rawNode' | 'resolve' | 'rawLocation'>;
+export type VisitFunction<T> = (node: T, ctx: UserContext & {
     ignoreNextVisitorsOnNode: () => void;
 }, parents?: any, context?: any) => void;
-declare type VisitRefFunction = (node: OasRef, ctx: UserContext, resolved: ResolveResult<any>) => void;
-declare type SkipFunction<T> = (node: T, key: string | number, ctx: SkipFunctionContext) => boolean;
-declare type VisitObject<T> = {
+type VisitRefFunction = (node: OasRef, ctx: UserContext, resolved: ResolveResult<any>) => void;
+type SkipFunction<T> = (node: T, key: string | number, ctx: SkipFunctionContext) => boolean;
+type VisitObject<T> = {
     enter?: VisitFunction<T>;
     leave?: VisitFunction<T>;
     skip?: SkipFunction<T>;
 };
-declare type NestedVisitObject<T, P> = VisitObject<T> & NestedVisitor<P>;
-declare type VisitFunctionOrObject<T> = VisitFunction<T> | VisitObject<T>;
-declare type VisitorNode<T> = {
+export type NestedVisitObject<T, P> = VisitObject<T> & NestedVisitor<P>;
+type VisitFunctionOrObject<T> = VisitFunction<T> | VisitObject<T>;
+export type VisitorNode<T> = {
     ruleId: string;
     severity: ProblemSeverity;
     context: VisitorLevelContext | VisitorSkippedLevelContext;
@@ -26,14 +26,14 @@ declare type VisitorNode<T> = {
     visit: VisitFunction<T>;
     skip?: SkipFunction<T>;
 };
-declare type VisitorRefNode = {
+type VisitorRefNode = {
     ruleId: string;
     severity: ProblemSeverity;
     context: VisitorLevelContext;
     depth: number;
     visit: VisitRefFunction;
 };
-export declare type VisitorLevelContext = {
+export type VisitorLevelContext = {
     isSkippedLevel: false;
     type: NormalizedNodeType;
     parent: VisitorLevelContext | null;
@@ -45,13 +45,13 @@ export declare type VisitorLevelContext = {
         location?: Location;
     }>;
 };
-export declare type VisitorSkippedLevelContext = {
+export type VisitorSkippedLevelContext = {
     isSkippedLevel: true;
     parent: VisitorLevelContext;
     seen: Set<any>;
 };
-declare type NormalizeVisitor<Fn> = Fn extends VisitFunction<infer T> ? VisitorNode<T> : never;
-export declare type BaseVisitor = {
+export type NormalizeVisitor<Fn> = Fn extends VisitFunction<infer T> ? VisitorNode<T> : never;
+export type BaseVisitor = {
     any?: {
         enter?: VisitFunction<any>;
         leave?: VisitFunction<any>;
@@ -62,7 +62,7 @@ export declare type BaseVisitor = {
         leave?: VisitRefFunction;
     } | VisitRefFunction;
 };
-declare type Oas3FlatVisitor = {
+type Oas3FlatVisitor = {
     Root?: VisitFunctionOrObject<Oas3Definition>;
     Tag?: VisitFunctionOrObject<Oas3Tag>;
     ExternalDocs?: VisitFunctionOrObject<Oas3ExternalDocs>;
@@ -110,7 +110,7 @@ declare type Oas3FlatVisitor = {
     SecurityScheme?: VisitFunctionOrObject<Oas3SecurityScheme>;
     SpecExtension?: VisitFunctionOrObject<unknown>;
 };
-declare type Oas2FlatVisitor = {
+type Oas2FlatVisitor = {
     Root?: VisitFunctionOrObject<Oas2Definition>;
     Tag?: VisitFunctionOrObject<Oas2Tag>;
     ExternalDocs?: VisitFunctionOrObject<Oas2ExternalDocs>;
@@ -133,28 +133,26 @@ declare type Oas2FlatVisitor = {
     NamedResponses?: VisitFunctionOrObject<Record<string, Oas2Response>>;
     NamedParameters?: VisitFunctionOrObject<Record<string, Oas2Parameter>>;
     SecurityScheme?: VisitFunctionOrObject<Oas2SecurityScheme>;
+    NamedSecuritySchemes?: VisitFunctionOrObject<Record<string, Oas2SecurityScheme>>;
     SpecExtension?: VisitFunctionOrObject<unknown>;
 };
-declare type Async2FlatVisitor = {
+type Async2FlatVisitor = {
     Root?: VisitFunctionOrObject<Async2Definition>;
 };
-declare type Oas3NestedVisitor = {
+type Oas3NestedVisitor = {
     [T in keyof Oas3FlatVisitor]: Oas3FlatVisitor[T] extends Function ? Oas3FlatVisitor[T] : Oas3FlatVisitor[T] & NestedVisitor<Oas3NestedVisitor>;
 };
-declare type Oas2NestedVisitor = {
+type Oas2NestedVisitor = {
     [T in keyof Oas2FlatVisitor]: Oas2FlatVisitor[T] extends Function ? Oas2FlatVisitor[T] : Oas2FlatVisitor[T] & NestedVisitor<Oas2NestedVisitor>;
 };
-declare type Async2NestedVisitor = {
+type Async2NestedVisitor = {
     [T in keyof Async2FlatVisitor]: Async2FlatVisitor[T] extends Function ? Async2FlatVisitor[T] : Async2FlatVisitor[T] & NestedVisitor<Async2NestedVisitor>;
 };
-export declare type Oas3Visitor = BaseVisitor & Oas3NestedVisitor & Record<string, VisitFunction<any> | NestedVisitObject<any, Oas3NestedVisitor>>;
-export declare type Oas2Visitor = BaseVisitor & Oas2NestedVisitor & Record<string, VisitFunction<any> | NestedVisitObject<any, Oas2NestedVisitor>>;
-export declare type Async2Visitor = BaseVisitor & Async2NestedVisitor & Record<string, VisitFunction<any> | NestedVisitObject<any, Async2NestedVisitor>>;
-export declare type Oas3TransformVisitor = BaseVisitor & Oas3FlatVisitor & Record<string, VisitFunction<any> | VisitObject<any>>;
-export declare type Oas2TransformVisitor = BaseVisitor & Oas2FlatVisitor & Record<string, VisitFunction<any> | VisitObject<any>>;
-export declare type Async2TransformVisitor = BaseVisitor & Async2FlatVisitor & Record<string, VisitFunction<any> | VisitObject<any>>;
-export declare type NestedVisitor<T> = Exclude<T, 'any' | 'ref' | 'Root'>;
-export declare type NormalizedOasVisitors<T extends BaseVisitor> = {
+export type Oas3Visitor = BaseVisitor & Oas3NestedVisitor & Record<string, VisitFunction<any> | NestedVisitObject<any, Oas3NestedVisitor>>;
+export type Oas2Visitor = BaseVisitor & Oas2NestedVisitor & Record<string, VisitFunction<any> | NestedVisitObject<any, Oas2NestedVisitor>>;
+export type Async2Visitor = BaseVisitor & Async2NestedVisitor & Record<string, VisitFunction<any> | NestedVisitObject<any, Async2NestedVisitor>>;
+export type NestedVisitor<T> = Exclude<T, 'any' | 'ref' | 'Root'>;
+export type NormalizedOasVisitors<T extends BaseVisitor> = {
     [V in keyof T]-?: {
         enter: Array<NormalizeVisitor<T[V]>>;
         leave: Array<NormalizeVisitor<T[V]>>;
@@ -169,19 +167,19 @@ export declare type NormalizedOasVisitors<T extends BaseVisitor> = {
         leave: Array<VisitorNode<any>>;
     };
 };
-export declare type Oas3Rule = (options: Record<string, any>) => Oas3Visitor | Oas3Visitor[];
-export declare type Oas2Rule = (options: Record<string, any>) => Oas2Visitor | Oas2Visitor[];
-export declare type Async2Rule = (options: Record<string, any>) => Async2Visitor | Async2Visitor[];
-export declare type Oas3Preprocessor = (options: Record<string, any>) => Oas3TransformVisitor;
-export declare type Oas2Preprocessor = (options: Record<string, any>) => Oas2TransformVisitor;
-export declare type Async2Preprocessor = (options: Record<string, any>) => Async2TransformVisitor;
-export declare type Oas3Decorator = (options: Record<string, any>) => Oas3TransformVisitor;
-export declare type Oas2Decorator = (options: Record<string, any>) => Oas2TransformVisitor;
-export declare type Async2Decorator = (options: Record<string, any>) => Async2TransformVisitor;
-export declare type OasRule = Oas3Rule;
-export declare type OasPreprocessor = Oas3Preprocessor;
-export declare type OasDecorator = Oas3Decorator;
-export declare type RuleInstanceConfig = {
+export type Oas3Rule = (options: Record<string, any>) => Oas3Visitor | Oas3Visitor[];
+export type Oas2Rule = (options: Record<string, any>) => Oas2Visitor | Oas2Visitor[];
+export type Async2Rule = (options: Record<string, any>) => Async2Visitor | Async2Visitor[];
+export type Oas3Preprocessor = (options: Record<string, any>) => Oas3Visitor;
+export type Oas2Preprocessor = (options: Record<string, any>) => Oas2Visitor;
+export type Async2Preprocessor = (options: Record<string, any>) => Async2Visitor;
+export type Oas3Decorator = (options: Record<string, any>) => Oas3Visitor;
+export type Oas2Decorator = (options: Record<string, any>) => Oas2Visitor;
+export type Async2Decorator = (options: Record<string, any>) => Async2Visitor;
+export type OasRule = Oas3Rule;
+export type OasPreprocessor = Oas3Preprocessor;
+export type OasDecorator = Oas3Decorator;
+export type RuleInstanceConfig = {
     ruleId: string;
     severity: ProblemSeverity;
 };

package/lib/walk.d.ts

@@ -1,13 +1,13 @@
 import type { Referenced } from './typings/openapi';
-import type { NormalizedOasVisitors } from './visitors';
+import type { NormalizedOasVisitors, BaseVisitor } from './visitors';
 import type { ResolvedRefMap, Document } from './resolve';
 import type { NormalizedNodeType } from './types';
 import type { RuleSeverity } from './config';
 import { Location } from './ref-utils';
 import { ResolveError, YamlParseError, Source } from './resolve';
 import { SpecVersion } from './oas-types';
-declare type NonUndefined = string | number | boolean | symbol | bigint | object | Record<string, any>;
-export declare type ResolveResult<T extends NonUndefined> = {
+export type NonUndefined = string | number | boolean | symbol | bigint | object | Record<string, any>;
+export type ResolveResult<T extends NonUndefined> = {
     node: T;
     location: Location;
     error?: ResolveError | YamlParseError;
@@ -16,8 +16,8 @@ export declare type ResolveResult<T extends NonUndefined> = {
     location: undefined;
     error?: ResolveError | YamlParseError;
 };
-export declare type ResolveFn = <T>(node: Referenced<T>, from?: string) => ResolveResult<T>;
-export declare type UserContext = {
+export type ResolveFn = <T extends NonUndefined>(node: Referenced<T>, from?: string) => ResolveResult<T>;
+export type UserContext = {
     report(problem: Problem): void;
     location: Location;
     rawNode: any;
@@ -30,23 +30,23 @@ export declare type UserContext = {
     oasVersion: SpecVersion;
     getVisitorData: () => Record<string, unknown>;
 };
-export declare type Loc = {
+export type Loc = {
     line: number;
     col: number;
 };
-export declare type PointerLocationObject = {
+export type PointerLocationObject = {
     source: Source;
     reportOnKey?: boolean;
     pointer: string;
 };
-export declare type LineColLocationObject = Omit<PointerLocationObject, 'pointer'> & {
+export type LineColLocationObject = Omit<PointerLocationObject, 'pointer'> & {
     pointer: undefined;
     start: Loc;
     end?: Loc;
 };
-export declare type LocationObject = LineColLocationObject | PointerLocationObject;
-export declare type ProblemSeverity = 'error' | 'warn';
-export declare type Problem = {
+export type LocationObject = LineColLocationObject | PointerLocationObject;
+export type ProblemSeverity = 'error' | 'warn';
+export type Problem = {
     message: string;
     suggest?: string[];
     location?: Partial<LocationObject> | Array<Partial<LocationObject>>;
@@ -54,7 +54,7 @@ export declare type Problem = {
     forceSeverity?: RuleSeverity;
     ruleId?: string;
 };
-export declare type NormalizedProblem = {
+export type NormalizedProblem = {
     message: string;
     ruleId: string;
     severity: ProblemSeverity;
@@ -63,17 +63,16 @@ export declare type NormalizedProblem = {
     suggest: string[];
     ignored?: boolean;
 };
-export declare type WalkContext = {
+export type WalkContext = {
     problems: NormalizedProblem[];
     oasVersion: SpecVersion;
     visitorsData: Record<string, Record<string, unknown>>;
     refTypes?: Map<string, NormalizedNodeType>;
 };
-export declare function walkDocument<T>(opts: {
+export declare function walkDocument<T extends BaseVisitor>(opts: {
     document: Document;
     rootType: NormalizedNodeType;
     normalizedVisitors: NormalizedOasVisitors<T>;
     resolvedRefMap: ResolvedRefMap;
     ctx: WalkContext;
 }): void;
-export {};