@redocly/openapi-core 1.0.0-beta.98 → 1.0.0-rc.1

package/lib/utils.d.ts

@@ -1,5 +1,5 @@
 import { UserContext } from './walk';
-import type { HttpResolveConfig } from './config';
+import { HttpResolveConfig } from './config';
 export { parseYaml, stringifyYaml } from './js-yaml';
 export declare type StackFrame<T> = {
     prev: StackFrame<T> | null;
@@ -13,8 +13,8 @@ export declare function pushStack<T, P extends Stack<T> = Stack<T>>(head: P, val
 };
 export declare function popStack<T, P extends Stack<T>>(head: P): StackFrame<T> | null;
 export declare type BundleOutputFormat = 'json' | 'yml' | 'yaml';
-export declare function loadYaml(filename: string): Promise<unknown>;
-export declare function notUndefined<T>(x: T | undefined): x is T;
+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;
 export declare function isEmptyObject(value: any): value is object;
 export declare function isEmptyArray(value: any): boolean;
@@ -29,6 +29,7 @@ export declare function validateMimeType({ type, value }: any, { report, locatio
 export declare function validateMimeTypeOAS3({ type, value }: any, { report, location }: UserContext, allowedValues: string[]): void;
 export declare function isSingular(path: string): boolean;
 export declare function readFileAsStringSync(filePath: string): string;
+export declare function yamlAndJsonSyncReader<T>(filePath: string): T;
 export declare function isPathParameter(pathSegment: string): boolean;
 /**
  * Convert Windows backslash paths to slash paths: foo\\bar ➔ foo/bar
@@ -38,3 +39,14 @@ export declare function isNotEmptyObject(obj: any): boolean;
 export declare function isString(value: unknown): value is string;
 export declare function isNotString<T>(value: string | T): value is T;
 export declare function assignExisting<T>(target: Record<string, T>, obj: Record<string, T>): void;
+export declare function getMatchingStatusCodeRange(code: number | string): string;
+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 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)[];
+export declare function pickDefined<T extends Record<string, unknown>>(obj?: T): Record<string, unknown> | undefined;
+export declare function nextTick(): void;

package/lib/utils.js

@@ -9,13 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignExisting = exports.isNotString = exports.isString = exports.isNotEmptyObject = exports.slash = exports.isPathParameter = exports.readFileAsStringSync = exports.isSingular = exports.validateMimeTypeOAS3 = exports.validateMimeType = exports.splitCamelCaseIntoWords = exports.omitObjectProps = exports.pickObjectProps = exports.readFileFromUrl = exports.isEmptyArray = exports.isEmptyObject = exports.isPlainObject = exports.notUndefined = exports.loadYaml = exports.popStack = exports.pushStack = exports.stringifyYaml = exports.parseYaml = void 0;
+exports.nextTick = exports.pickDefined = exports.keysOf = exports.identity = exports.isTruthy = exports.showErrorForDeprecatedField = exports.showWarningForDeprecatedField = exports.doesYamlFileExist = exports.isCustomRuleId = exports.getMatchingStatusCodeRange = exports.assignExisting = exports.isNotString = exports.isString = exports.isNotEmptyObject = exports.slash = exports.isPathParameter = exports.yamlAndJsonSyncReader = exports.readFileAsStringSync = exports.isSingular = exports.validateMimeTypeOAS3 = exports.validateMimeType = exports.splitCamelCaseIntoWords = exports.omitObjectProps = exports.pickObjectProps = exports.readFileFromUrl = exports.isEmptyArray = exports.isEmptyObject = exports.isPlainObject = exports.isDefined = exports.loadYaml = exports.popStack = exports.pushStack = exports.stringifyYaml = exports.parseYaml = void 0;
 const fs = require("fs");
+const path_1 = require("path");
 const minimatch = require("minimatch");
 const node_fetch_1 = require("node-fetch");
 const pluralize = require("pluralize");
 const js_yaml_1 = require("./js-yaml");
-const config_1 = require("./config");
+const env_1 = require("./env");
+const logger_1 = require("./logger");
 var js_yaml_2 = require("./js-yaml");
 Object.defineProperty(exports, "parseYaml", { enumerable: true, get: function () { return js_yaml_2.parseYaml; } });
 Object.defineProperty(exports, "stringifyYaml", { enumerable: true, get: function () { return js_yaml_2.stringifyYaml; } });
@@ -35,10 +37,10 @@ function loadYaml(filename) {
     });
 }
 exports.loadYaml = loadYaml;
-function notUndefined(x) {
+function isDefined(x) {
     return x !== undefined;
 }
-exports.notUndefined = notUndefined;
+exports.isDefined = isDefined;
 function isPlainObject(value) {
     return value !== null && typeof value === 'object' && !Array.isArray(value);
 }
@@ -57,7 +59,7 @@ function readFileFromUrl(url, config) {
         for (const header of config.headers) {
             if (match(url, header.matches)) {
                 headers[header.name] =
-                    header.envVariable !== undefined ? config_1.env[header.envVariable] || '' : header.value;
+                    header.envVariable !== undefined ? env_1.env[header.envVariable] || '' : header.value;
             }
         }
         const req = yield (config.customFetch || node_fetch_1.default)(url, {
@@ -88,7 +90,7 @@ exports.omitObjectProps = omitObjectProps;
 function splitCamelCaseIntoWords(str) {
     const camel = str
         .split(/(?:[-._])|([A-Z][a-z]+)/)
-        .filter(Boolean)
+        .filter(isTruthy)
         .map((item) => item.toLocaleLowerCase());
     const caps = str
         .split(/([A-Z]{2,})/)
@@ -137,6 +139,11 @@ function readFileAsStringSync(filePath) {
     return fs.readFileSync(filePath, 'utf-8');
 }
 exports.readFileAsStringSync = readFileAsStringSync;
+function yamlAndJsonSyncReader(filePath) {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    return js_yaml_1.parseYaml(content);
+}
+exports.yamlAndJsonSyncReader = yamlAndJsonSyncReader;
 function isPathParameter(pathSegment) {
     return pathSegment.startsWith('{') && pathSegment.endsWith('}');
 }
@@ -166,10 +173,69 @@ function isNotString(value) {
 }
 exports.isNotString = isNotString;
 function assignExisting(target, obj) {
-    for (let k of Object.keys(obj)) {
+    for (const k of Object.keys(obj)) {
         if (target.hasOwnProperty(k)) {
             target[k] = obj[k];
         }
     }
 }
 exports.assignExisting = assignExisting;
+function getMatchingStatusCodeRange(code) {
+    return `${code}`.replace(/^(\d)\d\d$/, (_, firstDigit) => `${firstDigit}XX`);
+}
+exports.getMatchingStatusCodeRange = getMatchingStatusCodeRange;
+function isCustomRuleId(id) {
+    return id.includes('/');
+}
+exports.isCustomRuleId = isCustomRuleId;
+function doesYamlFileExist(filePath) {
+    return ((path_1.extname(filePath) === '.yaml' || path_1.extname(filePath) === '.yml') &&
+        fs.hasOwnProperty('existsSync') &&
+        fs.existsSync(filePath));
+}
+exports.doesYamlFileExist = doesYamlFileExist;
+function showWarningForDeprecatedField(deprecatedField, updatedField, updatedObject) {
+    logger_1.logger.warn(`The '${logger_1.colorize.red(deprecatedField)}' field is deprecated. ${updatedField
+        ? `Use ${logger_1.colorize.green(getUpdatedFieldName(updatedField, updatedObject))} instead. `
+        : ''}Read more about this change: https://redocly.com/docs/api-registry/guides/migration-guide-config-file/#changed-properties\n`);
+}
+exports.showWarningForDeprecatedField = showWarningForDeprecatedField;
+function showErrorForDeprecatedField(deprecatedField, updatedField, updatedObject) {
+    throw new Error(`Do not use '${deprecatedField}' field. ${updatedField ? `Use '${getUpdatedFieldName(updatedField, updatedObject)}' instead. ` : ''}\n`);
+}
+exports.showErrorForDeprecatedField = showErrorForDeprecatedField;
+function isTruthy(value) {
+    return !!value;
+}
+exports.isTruthy = isTruthy;
+function identity(value) {
+    return value;
+}
+exports.identity = identity;
+function keysOf(obj) {
+    if (!obj)
+        return [];
+    return Object.keys(obj);
+}
+exports.keysOf = keysOf;
+function pickDefined(obj) {
+    if (!obj)
+        return undefined;
+    const res = {};
+    for (const key in obj) {
+        if (obj[key] !== undefined) {
+            res[key] = obj[key];
+        }
+    }
+    return res;
+}
+exports.pickDefined = pickDefined;
+function nextTick() {
+    new Promise((resolve) => {
+        setTimeout(resolve);
+    });
+}
+exports.nextTick = nextTick;
+function getUpdatedFieldName(updatedField, updatedObject) {
+    return `${typeof updatedObject !== 'undefined' ? `${updatedObject}.` : ''}${updatedField}`;
+}

package/lib/visitors.d.ts

@@ -1,14 +1,15 @@
 import type { Oas3Definition, Oas3ExternalDocs, Oas3Info, Oas3Contact, Oas3Components, Oas3License, Oas3Schema, Oas3Header, Oas3Parameter, Oas3Operation, Oas3PathItem, Oas3ServerVariable, Oas3Server, Oas3MediaType, Oas3Response, Oas3Example, Oas3RequestBody, Oas3Tag, OasRef, Oas3SecurityScheme, Oas3SecurityRequirement, Oas3Encoding, Oas3Link, Oas3Xml, Oas3Discriminator, Oas3Callback } from './typings/openapi';
-import { Oas2Definition, Oas2Tag, Oas2ExternalDocs, Oas2SecurityRequirement, Oas2Info, Oas2Contact, Oas2License, Oas2PathItem, Oas2Operation, Oas2Header, Oas2Response, Oas2Schema, Oas2Xml, Oas2Parameter, Oas2SecurityScheme } from './typings/swagger';
+import type { Oas2Definition, Oas2Tag, Oas2ExternalDocs, Oas2SecurityRequirement, Oas2Info, Oas2Contact, Oas2License, Oas2PathItem, Oas2Operation, Oas2Header, Oas2Response, Oas2Schema, Oas2Xml, Oas2Parameter, Oas2SecurityScheme } from './typings/swagger';
 import { NormalizedNodeType } from './types';
-import { Stack } from './utils';
-import { UserContext, ResolveResult, ProblemSeverity } from './walk';
-import { Location } from './ref-utils';
+import type { Stack } from './utils';
+import type { UserContext, ResolveResult, ProblemSeverity } from './walk';
+import type { Location } from './ref-utils';
+export declare type SkipFunctionContext = Pick<UserContext, 'location' | 'rawNode' | 'resolve' | 'rawLocation'>;
 export declare 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) => boolean;
+declare type SkipFunction<T> = (node: T, key: string | number, ctx: SkipFunctionContext) => boolean;
 declare type VisitObject<T> = {
     enter?: VisitFunction<T>;
     leave?: VisitFunction<T>;
@@ -16,7 +17,7 @@ declare type VisitObject<T> = {
 };
 declare type NestedVisitObject<T, P> = VisitObject<T> & NestedVisitor<P>;
 declare type VisitFunctionOrObject<T> = VisitFunction<T> | VisitObject<T>;
-declare type VisitorNode<T extends any> = {
+declare type VisitorNode<T> = {
     ruleId: string;
     severity: ProblemSeverity;
     context: VisitorLevelContext | VisitorSkippedLevelContext;
@@ -61,7 +62,7 @@ export declare type BaseVisitor = {
     } | VisitRefFunction;
 };
 declare type Oas3FlatVisitor = {
-    DefinitionRoot?: VisitFunctionOrObject<Oas3Definition>;
+    Root?: VisitFunctionOrObject<Oas3Definition>;
     Tag?: VisitFunctionOrObject<Oas3Tag>;
     ExternalDocs?: VisitFunctionOrObject<Oas3ExternalDocs>;
     Server?: VisitFunctionOrObject<Oas3Server>;
@@ -70,18 +71,19 @@ declare type Oas3FlatVisitor = {
     Info?: VisitFunctionOrObject<Oas3Info>;
     Contact?: VisitFunctionOrObject<Oas3Contact>;
     License?: VisitFunctionOrObject<Oas3License>;
-    PathMap?: VisitFunctionOrObject<Record<string, Oas3PathItem>>;
+    Paths?: VisitFunctionOrObject<Record<string, Oas3PathItem>>;
     PathItem?: VisitFunctionOrObject<Oas3PathItem>;
-    Callback?: VisitFunctionOrObject<Record<string, Oas3PathItem>>;
+    Callback?: VisitFunctionOrObject<Oas3Callback>;
+    CallbacksMap?: VisitFunctionOrObject<Record<string, Oas3Callback>>;
     Parameter?: VisitFunctionOrObject<Oas3Parameter>;
     Operation?: VisitFunctionOrObject<Oas3Operation>;
     RequestBody?: VisitFunctionOrObject<Oas3RequestBody>;
-    MediaTypeMap?: VisitFunctionOrObject<Record<string, Oas3MediaType>>;
+    MediaTypesMap?: VisitFunctionOrObject<Record<string, Oas3MediaType>>;
     MediaType?: VisitFunctionOrObject<Oas3MediaType>;
     Example?: VisitFunctionOrObject<Oas3Example>;
     Encoding?: VisitFunctionOrObject<Oas3Encoding>;
     Header?: VisitFunctionOrObject<Oas3Header>;
-    ResponsesMap?: VisitFunctionOrObject<Record<string, Oas3Response>>;
+    Responses?: VisitFunctionOrObject<Record<string, Oas3Response>>;
     Response?: VisitFunctionOrObject<Oas3Response>;
     Link?: VisitFunctionOrObject<Oas3Link>;
     Schema?: VisitFunctionOrObject<Oas3Schema>;
@@ -103,24 +105,25 @@ declare type Oas3FlatVisitor = {
     PasswordFlow?: VisitFunctionOrObject<Oas3SecurityScheme['flows']['password']>;
     ClientCredentials?: VisitFunctionOrObject<Oas3SecurityScheme['flows']['clientCredentials']>;
     AuthorizationCode?: VisitFunctionOrObject<Oas3SecurityScheme['flows']['authorizationCode']>;
-    SecuritySchemeFlows?: VisitFunctionOrObject<Oas3SecurityScheme['flows']>;
+    OAuth2Flows?: VisitFunctionOrObject<Oas3SecurityScheme['flows']>;
     SecurityScheme?: VisitFunctionOrObject<Oas3SecurityScheme>;
+    SpecExtension?: VisitFunctionOrObject<unknown>;
 };
 declare type Oas2FlatVisitor = {
-    DefinitionRoot?: VisitFunctionOrObject<Oas2Definition>;
+    Root?: VisitFunctionOrObject<Oas2Definition>;
     Tag?: VisitFunctionOrObject<Oas2Tag>;
     ExternalDocs?: VisitFunctionOrObject<Oas2ExternalDocs>;
     SecurityRequirement?: VisitFunctionOrObject<Oas2SecurityRequirement>;
     Info?: VisitFunctionOrObject<Oas2Info>;
     Contact?: VisitFunctionOrObject<Oas2Contact>;
     License?: VisitFunctionOrObject<Oas2License>;
-    PathMap?: VisitFunctionOrObject<Record<string, Oas2PathItem>>;
+    Paths?: VisitFunctionOrObject<Record<string, Oas2PathItem>>;
     PathItem?: VisitFunctionOrObject<Oas2PathItem>;
     Parameter?: VisitFunctionOrObject<any>;
     Operation?: VisitFunctionOrObject<Oas2Operation>;
     Examples?: VisitFunctionOrObject<Record<string, any>>;
     Header?: VisitFunctionOrObject<Oas2Header>;
-    ResponsesMap?: VisitFunctionOrObject<Record<string, Oas2Response>>;
+    Responses?: VisitFunctionOrObject<Record<string, Oas2Response>>;
     Response?: VisitFunctionOrObject<Oas2Response>;
     Schema?: VisitFunctionOrObject<Oas2Schema>;
     Xml?: VisitFunctionOrObject<Oas2Xml>;
@@ -129,6 +132,7 @@ declare type Oas2FlatVisitor = {
     NamedResponses?: VisitFunctionOrObject<Record<string, Oas2Response>>;
     NamedParameters?: VisitFunctionOrObject<Record<string, Oas2Parameter>>;
     SecurityScheme?: VisitFunctionOrObject<Oas2SecurityScheme>;
+    SpecExtension?: VisitFunctionOrObject<unknown>;
 };
 declare type Oas3NestedVisitor = {
     [T in keyof Oas3FlatVisitor]: Oas3FlatVisitor[T] extends Function ? Oas3FlatVisitor[T] : Oas3FlatVisitor[T] & NestedVisitor<Oas3NestedVisitor>;
@@ -140,7 +144,7 @@ export declare type Oas3Visitor = BaseVisitor & Oas3NestedVisitor & Record<strin
 export declare type Oas2Visitor = BaseVisitor & Oas2NestedVisitor & Record<string, VisitFunction<any> | NestedVisitObject<any, Oas2NestedVisitor>>;
 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 NestedVisitor<T> = Exclude<T, 'any' | 'ref' | 'DefinitionRoot'>;
+export declare type NestedVisitor<T> = Exclude<T, 'any' | 'ref' | 'Root'>;
 export declare type NormalizedOasVisitors<T extends BaseVisitor> = {
     [V in keyof T]-?: {
         enter: Array<NormalizeVisitor<T[V]>>;

package/lib/visitors.js

@@ -1,6 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeVisitors = void 0;
+const types_1 = require("./types");
+const legacyTypesMap = {
+    Root: 'DefinitionRoot',
+    ServerVariablesMap: 'ServerVariableMap',
+    Paths: ['PathMap', 'PathsMap'],
+    CallbacksMap: 'CallbackMap',
+    MediaTypesMap: 'MediaTypeMap',
+    ExamplesMap: 'ExampleMap',
+    EncodingMap: 'EncodingsMap',
+    HeadersMap: 'HeaderMap',
+    LinksMap: 'LinkMap',
+    OAuth2Flows: 'SecuritySchemeFlows',
+    Responses: 'ResponsesMap',
+};
 function normalizeVisitors(visitorsConfig, types) {
     const normalizedVisitors = {};
     normalizedVisitors.any = {
@@ -30,7 +44,7 @@ function normalizeVisitors(visitorsConfig, types) {
             return;
         stack = [...stack, from];
         const possibleChildren = new Set();
-        for (let type of Object.values(from.properties)) {
+        for (const type of Object.values(from.properties)) {
             if (type === to) {
                 addWeakFromStack(ruleConf, stack);
                 continue;
@@ -55,7 +69,10 @@ function normalizeVisitors(visitorsConfig, types) {
                 possibleChildren.add(from.items);
             }
         }
-        for (let fromType of Array.from(possibleChildren.values())) {
+        if (from.extensionsPrefix) {
+            possibleChildren.add(types_1.SpecExtension);
+        }
+        for (const fromType of Array.from(possibleChildren.values())) {
             addWeakNodes(ruleConf, fromType, to, parentContext, stack);
         }
         function addWeakFromStack(ruleConf, stack) {
@@ -74,6 +91,13 @@ function normalizeVisitors(visitorsConfig, types) {
             }
         }
     }
+    function findLegacyVisitorNode(visitor, typeName) {
+        if (Array.isArray(typeName)) {
+            const name = typeName.find((name) => visitor[name]) || undefined;
+            return name && visitor[name];
+        }
+        return visitor[typeName];
+    }
     function normalizeVisitorLevel(ruleConf, visitor, parentContext, depth = 0) {
         const visitorKeys = Object.keys(types);
         if (depth === 0) {
@@ -89,7 +113,8 @@ function normalizeVisitors(visitorsConfig, types) {
             }
         }
         for (const typeName of visitorKeys) {
-            const typeVisitor = visitor[typeName];
+            const typeVisitor = (visitor[typeName] ||
+                findLegacyVisitorNode(visitor, legacyTypesMap[typeName]));
             const normalizedTypeVisitor = normalizedVisitors[typeName];
             if (!typeVisitor)
                 continue;

package/lib/walk.d.ts

@@ -1,9 +1,11 @@
-import { Referenced } from './typings/openapi';
+import type { Referenced } from './typings/openapi';
+import type { NormalizedOasVisitors } from './visitors';
+import type { ResolvedRefMap, Document } from './resolve';
+import type { NormalizedNodeType } from './types';
+import type { RuleSeverity } from './config';
 import { Location } from './ref-utils';
-import { NormalizedOasVisitors } from './visitors';
-import { ResolvedRefMap, Document, ResolveError, YamlParseError, Source } from './resolve';
+import { ResolveError, YamlParseError, Source } from './resolve';
 import { OasVersion } from './oas-types';
-import { NormalizedNodeType } from './types';
 declare type NonUndefined = string | number | boolean | symbol | bigint | object | Record<string, any>;
 export declare type ResolveResult<T extends NonUndefined> = {
     node: T;
@@ -14,23 +16,13 @@ export declare type ResolveResult<T extends NonUndefined> = {
     location: undefined;
     error?: ResolveError | YamlParseError;
 };
-export declare type ResolveFn<T> = (node: Referenced<T>, from?: string) => {
-    location: Location;
-    node: T;
-} | {
-    location: undefined;
-    node: undefined;
-};
+export declare type ResolveFn = <T>(node: Referenced<T>, from?: string) => ResolveResult<T>;
 export declare type UserContext = {
     report(problem: Problem): void;
     location: Location;
-    resolve<T>(node: Referenced<T>): {
-        location: Location;
-        node: T;
-    } | {
-        location: undefined;
-        node: undefined;
-    };
+    rawNode: any;
+    rawLocation: Location;
+    resolve: ResolveFn;
     parentLocations: Record<string, Location>;
     type: NormalizedNodeType;
     key: string | number;
@@ -59,7 +51,7 @@ export declare type Problem = {
     suggest?: string[];
     location?: Partial<LocationObject> | Array<Partial<LocationObject>>;
     from?: LocationObject;
-    forceSeverity?: ProblemSeverity;
+    forceSeverity?: RuleSeverity;
     ruleId?: string;
 };
 export declare type NormalizedProblem = {

package/lib/walk.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.walkDocument = void 0;
 const ref_utils_1 = require("./ref-utils");
-const resolve_1 = require("./resolve");
 const utils_1 = require("./utils");
+const resolve_1 = require("./resolve");
 const types_1 = require("./types");
 function collectParents(ctx) {
     var _a;
@@ -28,33 +28,53 @@ function collectParentsLocations(ctx) {
 function walkDocument(opts) {
     const { document, rootType, normalizedVisitors, resolvedRefMap, ctx } = opts;
     const seenNodesPerType = {};
-    const seenRefs = new Set();
+    const ignoredNodes = new Set();
     walkNode(document.parsed, rootType, new ref_utils_1.Location(document.source, '#/'), undefined, '');
     function walkNode(node, type, location, parent, key) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const resolve = (ref, from = currentLocation.source.absoluteRef) => {
+            if (!ref_utils_1.isRef(ref))
+                return { location, node: ref };
+            const refId = resolve_1.makeRefId(from, ref.$ref);
+            const resolvedRef = resolvedRefMap.get(refId);
+            if (!resolvedRef) {
+                return {
+                    location: undefined,
+                    node: undefined,
+                };
+            }
+            const { resolved, node, document, nodePointer, error } = resolvedRef;
+            const newLocation = resolved
+                ? new ref_utils_1.Location(document.source, nodePointer)
+                : error instanceof resolve_1.YamlParseError
+                    ? new ref_utils_1.Location(error.source, '')
+                    : undefined;
+            return { location: newLocation, node, error };
+        };
+        const rawLocation = location;
         let currentLocation = location;
         const { node: resolvedNode, location: resolvedLocation, error } = resolve(node);
         const enteredContexts = new Set();
         if (ref_utils_1.isRef(node)) {
             const refEnterVisitors = normalizedVisitors.ref.enter;
             for (const { visit: visitor, ruleId, severity, context } of refEnterVisitors) {
-                if (!seenRefs.has(node)) {
-                    enteredContexts.add(context);
-                    const report = reportFn.bind(undefined, ruleId, severity);
-                    visitor(node, {
-                        report,
-                        resolve,
-                        location,
-                        type,
-                        parent,
-                        key,
-                        parentLocations: {},
-                        oasVersion: ctx.oasVersion,
-                        getVisitorData: getVisitorDataFn.bind(undefined, ruleId)
-                    }, { node: resolvedNode, location: resolvedLocation, error });
-                    if ((resolvedLocation === null || resolvedLocation === void 0 ? void 0 : resolvedLocation.source.absoluteRef) && ctx.refTypes) {
-                        ctx.refTypes.set(resolvedLocation === null || resolvedLocation === void 0 ? void 0 : resolvedLocation.source.absoluteRef, type);
-                    }
+                enteredContexts.add(context);
+                const report = reportFn.bind(undefined, ruleId, severity);
+                visitor(node, {
+                    report,
+                    resolve,
+                    rawNode: node,
+                    rawLocation,
+                    location,
+                    type,
+                    parent,
+                    key,
+                    parentLocations: {},
+                    oasVersion: ctx.oasVersion,
+                    getVisitorData: getVisitorDataFn.bind(undefined, ruleId),
+                }, { node: resolvedNode, location: resolvedLocation, error });
+                if ((resolvedLocation === null || resolvedLocation === void 0 ? void 0 : resolvedLocation.source.absoluteRef) && ctx.refTypes) {
+                    ctx.refTypes.set(resolvedLocation === null || resolvedLocation === void 0 ? void 0 : resolvedLocation.source.absoluteRef, type);
                 }
             }
         }
@@ -66,6 +86,8 @@ function walkDocument(opts) {
             const currentEnterVisitors = anyEnterVisitors.concat(((_c = normalizedVisitors[type.name]) === null || _c === void 0 ? void 0 : _c.enter) || []);
             const activatedContexts = [];
             for (const { context, visit, skip, ruleId, severity } of currentEnterVisitors) {
+                if (ignoredNodes.has(currentLocation.pointer))
+                    break;
                 if (context.isSkippedLevel) {
                     if (context.parent.activatedOn &&
                         !context.parent.activatedOn.value.nextLevelTypeActivated &&
@@ -90,7 +112,13 @@ function walkDocument(opts) {
                             location: resolvedLocation,
                             nextLevelTypeActivated: null,
                             withParentNode: (_g = (_f = context.parent) === null || _f === void 0 ? void 0 : _f.activatedOn) === null || _g === void 0 ? void 0 : _g.value.node,
-                            skipped: (_k = (((_j = (_h = context.parent) === null || _h === void 0 ? void 0 : _h.activatedOn) === null || _j === void 0 ? void 0 : _j.value.skipped) || (skip === null || skip === void 0 ? void 0 : skip(resolvedNode, key)))) !== null && _k !== void 0 ? _k : false,
+                            skipped: (_k = (((_j = (_h = context.parent) === null || _h === void 0 ? void 0 : _h.activatedOn) === null || _j === void 0 ? void 0 : _j.value.skipped) ||
+                                (skip === null || skip === void 0 ? void 0 : skip(resolvedNode, key, {
+                                    location,
+                                    rawLocation,
+                                    resolve,
+                                    rawNode: node,
+                                })))) !== null && _k !== void 0 ? _k : false,
                         };
                         context.activatedOn = utils_1.pushStack(context.activatedOn, activatedOn);
                         let ctx = context.parent;
@@ -101,9 +129,7 @@ function walkDocument(opts) {
                         if (!activatedOn.skipped) {
                             visitedBySome = true;
                             enteredContexts.add(context);
-                            const { ignoreNextVisitorsOnNode } = visitWithContext(visit, resolvedNode, context, ruleId, severity);
-                            if (ignoreNextVisitorsOnNode)
-                                break;
+                            visitWithContext(visit, resolvedNode, node, context, ruleId, severity);
                         }
                     }
                 }
@@ -125,6 +151,9 @@ function walkDocument(opts) {
                     if (type.additionalProperties) {
                         props.push(...Object.keys(resolvedNode).filter((k) => !props.includes(k)));
                     }
+                    else if (type.extensionsPrefix) {
+                        props.push(...Object.keys(resolvedNode).filter((k) => k.startsWith(type.extensionsPrefix)));
+                    }
                     if (ref_utils_1.isRef(node)) {
                         props.push(...Object.keys(node).filter((k) => k !== '$ref' && !props.includes(k))); // properties on the same level as $ref
                     }
@@ -140,6 +169,11 @@ function walkDocument(opts) {
                             propType = type.additionalProperties;
                         if (typeof propType === 'function')
                             propType = propType(value, propName);
+                        if (propType === undefined &&
+                            type.extensionsPrefix &&
+                            propName.startsWith(type.extensionsPrefix)) {
+                            propType = types_1.SpecExtension;
+                        }
                         if (!types_1.isNamedType(propType) && (propType === null || propType === void 0 ? void 0 : propType.directResolveAs)) {
                             propType = propType.directResolveAs;
                             value = { $ref: value };
@@ -173,7 +207,7 @@ function walkDocument(opts) {
             }
             for (const { context, visit, ruleId, severity } of currentLeaveVisitors) {
                 if (!context.isSkippedLevel && enteredContexts.has(context)) {
-                    visitWithContext(visit, resolvedNode, context, ruleId, severity);
+                    visitWithContext(visit, resolvedNode, node, context, ruleId, severity);
                 }
             }
         }
@@ -186,63 +220,50 @@ function walkDocument(opts) {
                     visitor(node, {
                         report,
                         resolve,
+                        rawNode: node,
+                        rawLocation,
                         location,
                         type,
                         parent,
                         key,
                         parentLocations: {},
                         oasVersion: ctx.oasVersion,
-                        getVisitorData: getVisitorDataFn.bind(undefined, ruleId)
+                        getVisitorData: getVisitorDataFn.bind(undefined, ruleId),
                     }, { node: resolvedNode, location: resolvedLocation, error });
                 }
             }
         }
         // returns true ignores all the next visitors on the specific node
-        function visitWithContext(visit, node, context, ruleId, severity) {
+        function visitWithContext(visit, resolvedNode, node, context, ruleId, severity) {
             const report = reportFn.bind(undefined, ruleId, severity);
-            let ignoreNextVisitorsOnNode = false;
-            visit(node, {
+            visit(resolvedNode, {
                 report,
                 resolve,
+                rawNode: node,
                 location: currentLocation,
+                rawLocation,
                 type,
                 parent,
                 key,
                 parentLocations: collectParentsLocations(context),
                 oasVersion: ctx.oasVersion,
-                ignoreNextVisitorsOnNode: () => { ignoreNextVisitorsOnNode = true; },
+                ignoreNextVisitorsOnNode: () => {
+                    ignoredNodes.add(currentLocation.pointer);
+                },
                 getVisitorData: getVisitorDataFn.bind(undefined, ruleId),
             }, collectParents(context), context);
-            return { ignoreNextVisitorsOnNode };
-        }
-        function resolve(ref, from = currentLocation.source.absoluteRef) {
-            if (!ref_utils_1.isRef(ref))
-                return { location, node: ref };
-            const refId = resolve_1.makeRefId(from, ref.$ref);
-            const resolvedRef = resolvedRefMap.get(refId);
-            if (!resolvedRef) {
-                return {
-                    location: undefined,
-                    node: undefined,
-                };
-            }
-            const { resolved, node, document, nodePointer, error } = resolvedRef;
-            const newLocation = resolved
-                ? new ref_utils_1.Location(document.source, nodePointer)
-                : error instanceof resolve_1.YamlParseError
-                    ? new ref_utils_1.Location(error.source, '')
-                    : undefined;
-            return { location: newLocation, node, error };
         }
         function reportFn(ruleId, severity, opts) {
-            const loc = opts.location
+            const normalizedLocation = opts.location
                 ? Array.isArray(opts.location)
                     ? opts.location
                     : [opts.location]
                 : [Object.assign(Object.assign({}, currentLocation), { reportOnKey: false })];
-            ctx.problems.push(Object.assign(Object.assign({ ruleId: opts.ruleId || ruleId, severity: opts.forceSeverity || severity }, opts), { suggest: opts.suggest || [], location: loc.map((loc) => {
-                    return Object.assign(Object.assign(Object.assign({}, currentLocation), { reportOnKey: false }), loc);
-                }) }));
+            const location = normalizedLocation.map((l) => (Object.assign(Object.assign(Object.assign({}, currentLocation), { reportOnKey: false }), l)));
+            const ruleSeverity = opts.forceSeverity || severity;
+            if (ruleSeverity !== 'off') {
+                ctx.problems.push(Object.assign(Object.assign({ ruleId: opts.ruleId || ruleId, severity: ruleSeverity }, opts), { suggest: opts.suggest || [], location }));
+            }
         }
         function getVisitorDataFn(ruleId) {
             ctx.visitorsData[ruleId] = ctx.visitorsData[ruleId] || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "1.0.0-beta.98",
+  "version": "1.0.0-rc.1",
   "description": "",
   "main": "lib/index.js",
   "engines": {
@@ -16,7 +16,8 @@
     "fs": false,
     "path": "path-browserify",
     "os": false,
-    "node-fetch": false
+    "node-fetch": false,
+    "colorette": false
   },
   "homepage": "https://github.com/Redocly/redocly-cli",
   "keywords": [
@@ -28,12 +29,10 @@
     "oas"
   ],
   "contributors": [
-    "Sergey Dubovyk <serhii@redoc.ly> (https://redoc.ly/)",
-    "Roman Hotsiy <roman@redoc.ly> (https://redoc.ly/)",
-    "Andriy Leliv <andriy@redoc.ly> (https://redoc.ly/)"
+    "Roman Hotsiy <roman@redoc.ly> (https://redoc.ly/)"
   ],
   "dependencies": {
-    "@redocly/ajv": "^8.6.4",
+    "@redocly/ajv": "^8.11.0",
     "@types/node": "^14.11.8",
     "colorette": "^1.2.0",
     "js-levenshtein": "^1.1.6",