@redocly/openapi-core 1.0.0-beta.49 → 1.0.0-beta.53

package/lib/index.d.ts

@@ -7,13 +7,14 @@ export { Oas2Definition } from './typings/swagger';
 export { StatsAccumulator, StatsName } from './typings/common';
 export { normalizeTypes } from './types';
 export { Stats } from './rules/other/stats';
-export { loadConfig, Config, LintConfig, RawConfig, IGNORE_FILE } from './config/config';
+export { Config, LintConfig, RawConfig, IGNORE_FILE } from './config/config';
+export { loadConfig } from './config/load';
 export { RedoclyClient } from './redocly';
 export { Source, BaseResolver, Document, resolveDocument, ResolveError, YamlParseError } from './resolve';
 export { unescapePointer } from './ref-utils';
-export { detectOpenAPI, OasMajorVersion, openAPIMajor } from './lint';
+export { detectOpenAPI, OasMajorVersion, openAPIMajor, OasVersion } from './oas-types';
 export { normalizeVisitors } from './visitors';
 export { WalkContext, walkDocument, NormalizedProblem, ProblemSeverity, LineColLocationObject, LocationObject, Loc } from './walk';
 export { formatProblems, OutputFormat, getTotals, Totals } from './format/format';
-export { OasVersion, lint, lint as validate, lintDocument } from './lint';
+export { lint, lint as validate, lintDocument, lintFromString } from './lint';
 export { bundle } from './bundle';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundle = exports.lintDocument = exports.validate = exports.lint = exports.OasVersion = exports.getTotals = exports.formatProblems = exports.walkDocument = exports.normalizeVisitors = exports.openAPIMajor = exports.OasMajorVersion = exports.detectOpenAPI = exports.unescapePointer = exports.YamlParseError = exports.ResolveError = exports.resolveDocument = exports.BaseResolver = exports.Source = exports.RedoclyClient = exports.IGNORE_FILE = exports.LintConfig = exports.Config = exports.loadConfig = exports.Stats = exports.normalizeTypes = exports.Oas2Types = exports.Oas3Types = exports.Oas3_1Types = void 0;
+exports.bundle = exports.lintFromString = exports.lintDocument = exports.validate = exports.lint = exports.getTotals = exports.formatProblems = exports.walkDocument = exports.normalizeVisitors = exports.OasVersion = exports.openAPIMajor = exports.OasMajorVersion = exports.detectOpenAPI = exports.unescapePointer = exports.YamlParseError = exports.ResolveError = exports.resolveDocument = exports.BaseResolver = exports.Source = exports.RedoclyClient = exports.loadConfig = exports.IGNORE_FILE = exports.LintConfig = exports.Config = exports.Stats = exports.normalizeTypes = exports.Oas2Types = exports.Oas3Types = exports.Oas3_1Types = void 0;
 var oas3_1_1 = require("./types/oas3_1");
 Object.defineProperty(exports, "Oas3_1Types", { enumerable: true, get: function () { return oas3_1_1.Oas3_1Types; } });
 var oas3_1 = require("./types/oas3");
@@ -12,10 +12,11 @@ Object.defineProperty(exports, "normalizeTypes", { enumerable: true, get: functi
 var stats_1 = require("./rules/other/stats");
 Object.defineProperty(exports, "Stats", { enumerable: true, get: function () { return stats_1.Stats; } });
 var config_1 = require("./config/config");
-Object.defineProperty(exports, "loadConfig", { enumerable: true, get: function () { return config_1.loadConfig; } });
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
 Object.defineProperty(exports, "LintConfig", { enumerable: true, get: function () { return config_1.LintConfig; } });
 Object.defineProperty(exports, "IGNORE_FILE", { enumerable: true, get: function () { return config_1.IGNORE_FILE; } });
+var load_1 = require("./config/load");
+Object.defineProperty(exports, "loadConfig", { enumerable: true, get: function () { return load_1.loadConfig; } });
 var redocly_1 = require("./redocly");
 Object.defineProperty(exports, "RedoclyClient", { enumerable: true, get: function () { return redocly_1.RedoclyClient; } });
 var resolve_1 = require("./resolve");
@@ -26,10 +27,11 @@ Object.defineProperty(exports, "ResolveError", { enumerable: true, get: function
 Object.defineProperty(exports, "YamlParseError", { enumerable: true, get: function () { return resolve_1.YamlParseError; } });
 var ref_utils_1 = require("./ref-utils");
 Object.defineProperty(exports, "unescapePointer", { enumerable: true, get: function () { return ref_utils_1.unescapePointer; } });
-var lint_1 = require("./lint");
-Object.defineProperty(exports, "detectOpenAPI", { enumerable: true, get: function () { return lint_1.detectOpenAPI; } });
-Object.defineProperty(exports, "OasMajorVersion", { enumerable: true, get: function () { return lint_1.OasMajorVersion; } });
-Object.defineProperty(exports, "openAPIMajor", { enumerable: true, get: function () { return lint_1.openAPIMajor; } });
+var oas_types_1 = require("./oas-types");
+Object.defineProperty(exports, "detectOpenAPI", { enumerable: true, get: function () { return oas_types_1.detectOpenAPI; } });
+Object.defineProperty(exports, "OasMajorVersion", { enumerable: true, get: function () { return oas_types_1.OasMajorVersion; } });
+Object.defineProperty(exports, "openAPIMajor", { enumerable: true, get: function () { return oas_types_1.openAPIMajor; } });
+Object.defineProperty(exports, "OasVersion", { enumerable: true, get: function () { return oas_types_1.OasVersion; } });
 var visitors_1 = require("./visitors");
 Object.defineProperty(exports, "normalizeVisitors", { enumerable: true, get: function () { return visitors_1.normalizeVisitors; } });
 var walk_1 = require("./walk");
@@ -37,10 +39,10 @@ Object.defineProperty(exports, "walkDocument", { enumerable: true, get: function
 var format_1 = require("./format/format");
 Object.defineProperty(exports, "formatProblems", { enumerable: true, get: function () { return format_1.formatProblems; } });
 Object.defineProperty(exports, "getTotals", { enumerable: true, get: function () { return format_1.getTotals; } });
-var lint_2 = require("./lint");
-Object.defineProperty(exports, "OasVersion", { enumerable: true, get: function () { return lint_2.OasVersion; } });
-Object.defineProperty(exports, "lint", { enumerable: true, get: function () { return lint_2.lint; } });
-Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return lint_2.lint; } });
-Object.defineProperty(exports, "lintDocument", { enumerable: true, get: function () { return lint_2.lintDocument; } });
+var lint_1 = require("./lint");
+Object.defineProperty(exports, "lint", { enumerable: true, get: function () { return lint_1.lint; } });
+Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return lint_1.lint; } });
+Object.defineProperty(exports, "lintDocument", { enumerable: true, get: function () { return lint_1.lintDocument; } });
+Object.defineProperty(exports, "lintFromString", { enumerable: true, get: function () { return lint_1.lintFromString; } });
 var bundle_1 = require("./bundle");
 Object.defineProperty(exports, "bundle", { enumerable: true, get: function () { return bundle_1.bundle; } });

package/lib/lint.d.ts

@@ -1,33 +1,20 @@
 import { BaseResolver, Document } from './resolve';
-import { Oas3Rule, Oas3Preprocessor, Oas2Rule, Oas2Preprocessor } from './visitors';
 import { NodeType } from './types';
 import { LintConfig, Config } from './config/config';
-export declare enum OasVersion {
-    Version2 = "oas2",
-    Version3_0 = "oas3_0",
-    Version3_1 = "oas3_1"
-}
-export declare enum OasMajorVersion {
-    Version2 = "oas2",
-    Version3 = "oas3"
-}
-export declare type RuleSet<T> = Record<string, T>;
-export declare type Oas3RuleSet = Record<string, Oas3Rule>;
-export declare type Oas2RuleSet = Record<string, Oas2Rule>;
-export declare type Oas3PreprocessorsSet = Record<string, Oas3Preprocessor>;
-export declare type Oas2PreprocessorsSet = Record<string, Oas2Preprocessor>;
-export declare type Oas3DecoratorsSet = Record<string, Oas3Preprocessor>;
-export declare type Oas2DecoratorsSet = Record<string, Oas2Preprocessor>;
 export declare function lint(opts: {
     ref: string;
     config: Config;
     externalRefResolver?: BaseResolver;
 }): Promise<import("./walk").NormalizedProblem[]>;
+export declare function lintFromString(opts: {
+    source: string;
+    absoluteRef?: string;
+    config: Config;
+    externalRefResolver?: BaseResolver;
+}): Promise<import("./walk").NormalizedProblem[]>;
 export declare function lintDocument(opts: {
     document: Document;
     config: LintConfig;
     customTypes?: Record<string, NodeType>;
     externalRefResolver: BaseResolver;
 }): Promise<import("./walk").NormalizedProblem[]>;
-export declare function detectOpenAPI(root: any): OasVersion;
-export declare function openAPIMajor(version: OasVersion): OasMajorVersion;

package/lib/lint.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openAPIMajor = exports.detectOpenAPI = exports.lintDocument = exports.lint = exports.OasMajorVersion = exports.OasVersion = void 0;
+exports.lintDocument = exports.lintFromString = exports.lint = void 0;
 const resolve_1 = require("./resolve");
 const visitors_1 = require("./visitors");
 const oas3_1_1 = require("./types/oas3_1");
@@ -19,17 +19,7 @@ const walk_1 = require("./walk");
 const types_1 = require("./types");
 const rules_1 = require("./config/rules");
 const ajv_1 = require("./rules/ajv");
-var OasVersion;
-(function (OasVersion) {
-    OasVersion["Version2"] = "oas2";
-    OasVersion["Version3_0"] = "oas3_0";
-    OasVersion["Version3_1"] = "oas3_1";
-})(OasVersion = exports.OasVersion || (exports.OasVersion = {}));
-var OasMajorVersion;
-(function (OasMajorVersion) {
-    OasMajorVersion["Version2"] = "oas2";
-    OasMajorVersion["Version3"] = "oas3";
-})(OasMajorVersion = exports.OasMajorVersion || (exports.OasMajorVersion = {}));
+const oas_types_1 = require("./oas-types");
 function lint(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const { ref, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve) } = opts;
@@ -38,14 +28,22 @@ function lint(opts) {
     });
 }
 exports.lint = lint;
+function lintFromString(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { source, absoluteRef, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve) } = opts;
+        const document = resolve_1.makeDocumentFromString(source, absoluteRef || '/');
+        return lintDocument(Object.assign(Object.assign({ document }, opts), { externalRefResolver, config: opts.config.lint }));
+    });
+}
+exports.lintFromString = lintFromString;
 function lintDocument(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         ajv_1.releaseAjvInstance(); // FIXME: preprocessors can modify nodes which are then cached to ajv-instance by absolute path
         const { document, customTypes, externalRefResolver, config } = opts;
-        const oasVersion = detectOpenAPI(document.parsed);
-        const oasMajorVersion = openAPIMajor(oasVersion);
+        const oasVersion = oas_types_1.detectOpenAPI(document.parsed);
+        const oasMajorVersion = oas_types_1.openAPIMajor(oasVersion);
         const rules = config.getRulesForOasVersion(oasMajorVersion);
-        const types = types_1.normalizeTypes(config.extendTypes((customTypes !== null && customTypes !== void 0 ? customTypes : oasMajorVersion === OasMajorVersion.Version3) ? (oasVersion === OasVersion.Version3_1 ? oas3_1_1.Oas3_1Types : oas3_1.Oas3Types) : oas2_1.Oas2Types, oasVersion), config);
+        const types = types_1.normalizeTypes(config.extendTypes((customTypes !== null && customTypes !== void 0 ? customTypes : oasMajorVersion === oas_types_1.OasMajorVersion.Version3) ? (oasVersion === oas_types_1.OasVersion.Version3_1 ? oas3_1_1.Oas3_1Types : oas3_1.Oas3Types) : oas2_1.Oas2Types, oasVersion), config);
         const ctx = {
             problems: [],
             oasVersion: oasVersion,
@@ -69,31 +67,3 @@ function lintDocument(opts) {
     });
 }
 exports.lintDocument = lintDocument;
-function detectOpenAPI(root) {
-    if (typeof root !== 'object') {
-        throw new Error(`Document must be JSON object, got ${typeof root}`);
-    }
-    if (!(root.openapi || root.swagger)) {
-        throw new Error('This doesn’t look like an OpenAPI document.\n');
-    }
-    if (root.openapi && root.openapi.startsWith('3.0')) {
-        return OasVersion.Version3_0;
-    }
-    if (root.openapi && root.openapi.startsWith('3.1')) {
-        return OasVersion.Version3_1;
-    }
-    if (root.swagger && root.swagger === '2.0') {
-        return OasVersion.Version2;
-    }
-    throw new Error(`Unsupported OpenAPI Version: ${root.openapi || root.swagger}`);
-}
-exports.detectOpenAPI = detectOpenAPI;
-function openAPIMajor(version) {
-    if (version === OasVersion.Version2) {
-        return OasMajorVersion.Version2;
-    }
-    else {
-        return OasMajorVersion.Version3;
-    }
-}
-exports.openAPIMajor = openAPIMajor;

package/lib/oas-types.d.ts

@@ -0,0 +1,19 @@
+import { Oas3Rule, Oas3Preprocessor, Oas2Rule, Oas2Preprocessor } from './visitors';
+export declare type RuleSet<T> = Record<string, T>;
+export declare enum OasVersion {
+    Version2 = "oas2",
+    Version3_0 = "oas3_0",
+    Version3_1 = "oas3_1"
+}
+export declare enum OasMajorVersion {
+    Version2 = "oas2",
+    Version3 = "oas3"
+}
+export declare type Oas3RuleSet = Record<string, Oas3Rule>;
+export declare type Oas2RuleSet = Record<string, Oas2Rule>;
+export declare type Oas3PreprocessorsSet = Record<string, Oas3Preprocessor>;
+export declare type Oas2PreprocessorsSet = Record<string, Oas2Preprocessor>;
+export declare type Oas3DecoratorsSet = Record<string, Oas3Preprocessor>;
+export declare type Oas2DecoratorsSet = Record<string, Oas2Preprocessor>;
+export declare function detectOpenAPI(root: any): OasVersion;
+export declare function openAPIMajor(version: OasVersion): OasMajorVersion;

package/lib/oas-types.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openAPIMajor = exports.detectOpenAPI = exports.OasMajorVersion = exports.OasVersion = void 0;
+var OasVersion;
+(function (OasVersion) {
+    OasVersion["Version2"] = "oas2";
+    OasVersion["Version3_0"] = "oas3_0";
+    OasVersion["Version3_1"] = "oas3_1";
+})(OasVersion = exports.OasVersion || (exports.OasVersion = {}));
+var OasMajorVersion;
+(function (OasMajorVersion) {
+    OasMajorVersion["Version2"] = "oas2";
+    OasMajorVersion["Version3"] = "oas3";
+})(OasMajorVersion = exports.OasMajorVersion || (exports.OasMajorVersion = {}));
+function detectOpenAPI(root) {
+    if (typeof root !== 'object') {
+        throw new Error(`Document must be JSON object, got ${typeof root}`);
+    }
+    if (!(root.openapi || root.swagger)) {
+        throw new Error('This doesn’t look like an OpenAPI document.\n');
+    }
+    if (root.openapi && root.openapi.startsWith('3.0')) {
+        return OasVersion.Version3_0;
+    }
+    if (root.openapi && root.openapi.startsWith('3.1')) {
+        return OasVersion.Version3_1;
+    }
+    if (root.swagger && root.swagger === '2.0') {
+        return OasVersion.Version2;
+    }
+    throw new Error(`Unsupported OpenAPI Version: ${root.openapi || root.swagger}`);
+}
+exports.detectOpenAPI = detectOpenAPI;
+function openAPIMajor(version) {
+    if (version === OasVersion.Version2) {
+        return OasMajorVersion.Version2;
+    }
+    else {
+        return OasMajorVersion.Version3;
+    }
+}
+exports.openAPIMajor = openAPIMajor;

package/lib/resolve.d.ts

@@ -1,4 +1,4 @@
-import { YAMLNode } from 'yaml-ast-parser';
+import type { YAMLNode, LoadOptions } from 'yaml-ast-parser';
 import { NormalizedNodeType } from './types';
 import { ResolveConfig } from './config/config';
 export declare type CollectedRefs = Map<string, Document>;
@@ -9,7 +9,7 @@ export declare class Source {
     constructor(absoluteRef: string, body: string, mimeType?: string | undefined);
     private _ast;
     private _lines;
-    getAst(): YAMLNode;
+    getAst(safeLoad: (input: string, options?: LoadOptions | undefined) => YAMLNode): YAMLNode;
     getLines(): string[];
 }
 export declare class ResolveError extends Error {
@@ -27,6 +27,10 @@ export declare type Document = {
     source: Source;
     parsed: any;
 };
+export declare function makeDocumentFromString(sourceString: string, absoluteRef: string): {
+    source: Source;
+    parsed: string | object | undefined;
+};
 export declare class BaseResolver {
     private config;
     cache: Map<string, Promise<Document | ResolveError>>;

package/lib/resolve.js

@@ -9,13 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveDocument = exports.BaseResolver = exports.YamlParseError = exports.ResolveError = exports.Source = void 0;
+exports.resolveDocument = exports.BaseResolver = exports.makeDocumentFromString = exports.YamlParseError = exports.ResolveError = exports.Source = void 0;
 const fs = require("fs");
 const path = require("path");
 const url = require("url");
 const yaml = require("js-yaml");
 const ref_utils_1 = require("./ref-utils");
-const yaml_ast_parser_1 = require("yaml-ast-parser");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
 class Source {
@@ -24,13 +23,14 @@ class Source {
         this.body = body;
         this.mimeType = mimeType;
     }
-    getAst() {
+    // pass safeLoad as argument to separate it from browser bundle
+    getAst(safeLoad) {
         var _a;
         if (this._ast === undefined) {
-            this._ast = (_a = yaml_ast_parser_1.safeLoad(this.body, { filename: this.absoluteRef })) !== null && _a !== void 0 ? _a : undefined;
+            this._ast = (_a = safeLoad(this.body, { filename: this.absoluteRef })) !== null && _a !== void 0 ? _a : undefined;
             // fix ast representation of file with newlines only
             if (this._ast &&
-                this._ast.kind === yaml_ast_parser_1.Kind.SCALAR &&
+                this._ast.kind === 0 && // KIND.scalar = 0
                 this._ast.value === '' &&
                 this._ast.startPosition !== 1) {
                 this._ast.startPosition = 1;
@@ -70,6 +70,19 @@ class YamlParseError extends Error {
     }
 }
 exports.YamlParseError = YamlParseError;
+function makeDocumentFromString(sourceString, absoluteRef) {
+    const source = new Source(absoluteRef, sourceString);
+    try {
+        return {
+            source,
+            parsed: yaml.safeLoad(sourceString, { filename: absoluteRef }),
+        };
+    }
+    catch (e) {
+        throw new YamlParseError(e, source);
+    }
+}
+exports.makeDocumentFromString = makeDocumentFromString;
 class BaseResolver {
     constructor(config = { http: { headers: [] } }) {
         this.config = config;

package/lib/rules/ajv.d.ts

@@ -1,10 +1,10 @@
-import * as Ajv from '@redocly/ajv';
+import { ErrorObject } from '@redocly/ajv';
 import { Location } from '../ref-utils';
 import { ResolveFn } from '../walk';
 export declare function releaseAjvInstance(): void;
-export declare function validateJsonSchema(data: any, schema: any, schemaLoc: Location, dataPath: string, resolve: ResolveFn<any>, disallowAdditionalProperties: boolean): {
+export declare function validateJsonSchema(data: any, schema: any, schemaLoc: Location, instancePath: string, resolve: ResolveFn<any>, disallowAdditionalProperties: boolean): {
     valid: boolean;
-    errors: (Ajv.ErrorObject & {
+    errors: (ErrorObject & {
         suggest?: string[];
     })[];
 };

package/lib/rules/ajv.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateJsonSchema = exports.releaseAjvInstance = void 0;
-// @ts-ignore
-const Ajv = require("@redocly/ajv");
-// import * as jsonSpecV4 from 'ajv/lib/refs/json-schema-draft-04.json';
-// import { OasVersion } from '../validate';
+const ajv_1 = require("@redocly/ajv");
 const ref_utils_1 = require("../ref-utils");
 let ajvInstance = null;
 function releaseAjvInstance() {
@@ -13,22 +10,22 @@ function releaseAjvInstance() {
 exports.releaseAjvInstance = releaseAjvInstance;
 function getAjv(resolve, disallowAdditionalProperties) {
     if (!ajvInstance) {
-        ajvInstance = new Ajv({
-            schemaId: 'auto',
+        ajvInstance = new ajv_1.default({
+            schemaId: '$id',
             meta: true,
             allErrors: true,
-            jsonPointers: true,
-            unknownFormats: 'ignore',
-            nullable: true,
-            missingRefs: 'ignore',
+            strictSchema: false,
             inlineRefs: false,
             validateSchema: false,
+            discriminator: true,
+            allowUnionTypes: true,
+            validateFormats: false,
             defaultAdditionalProperties: !disallowAdditionalProperties,
-            loadSchemaSync(base, $ref, id) {
-                const resolvedRef = resolve({ $ref }, base.replace(/#$/, ''));
+            loadSchemaSync(base, $ref) {
+                const resolvedRef = resolve({ $ref }, base.split('#')[0]);
                 if (!resolvedRef || !resolvedRef.location)
                     return undefined;
-                return Object.assign({ id }, resolvedRef.node);
+                return Object.assign({ $id: resolvedRef.location.absolutePointer }, resolvedRef.node);
             },
             logger: false,
         });
@@ -38,15 +35,21 @@ function getAjv(resolve, disallowAdditionalProperties) {
 function getAjvValidator(schema, loc, resolve, disallowAdditionalProperties) {
     const ajv = getAjv(resolve, disallowAdditionalProperties);
     if (!ajv.getSchema(loc.absolutePointer)) {
-        ajv.addSchema(Object.assign({ id: loc.absolutePointer }, schema), loc.absolutePointer);
+        ajv.addSchema(Object.assign({ $id: loc.absolutePointer }, schema), loc.absolutePointer);
     }
     return ajv.getSchema(loc.absolutePointer);
 }
-function validateJsonSchema(data, schema, schemaLoc, dataPath, resolve, disallowAdditionalProperties) {
+function validateJsonSchema(data, schema, schemaLoc, instancePath, resolve, disallowAdditionalProperties) {
     const validate = getAjvValidator(schema, schemaLoc, resolve, disallowAdditionalProperties);
     if (!validate)
         return { valid: true, errors: [] }; // unresolved refs are reported
-    const valid = validate(data, dataPath);
+    const valid = validate(data, {
+        instancePath,
+        parentData: { fake: {} },
+        parentDataProperty: 'fake',
+        rootData: {},
+        dynamicAnchors: {},
+    });
     return {
         valid: !!valid,
         errors: (validate.errors || []).map(beatifyErrorMessage),
@@ -60,7 +63,7 @@ function validateJsonSchema(data, schema, schemaLoc, dataPath, resolve, disallow
         if (error.keyword === 'type') {
             message = `type ${message}`;
         }
-        const relativePath = error.dataPath.substring(dataPath.length + 1);
+        const relativePath = error.instancePath.substring(instancePath.length + 1);
         const propName = relativePath.substring(relativePath.lastIndexOf('/') + 1);
         if (propName) {
             message = `\`${propName}\` property ${message}`;
@@ -68,7 +71,7 @@ function validateJsonSchema(data, schema, schemaLoc, dataPath, resolve, disallow
         if (error.keyword === 'additionalProperties') {
             const property = error.params.additionalProperty;
             message = `${message} \`${property}\``;
-            error.dataPath += '/' + ref_utils_1.escapePointer(property);
+            error.instancePath += '/' + ref_utils_1.escapePointer(property);
         }
         return Object.assign(Object.assign({}, error), { message,
             suggest });

package/lib/rules/common/info-contact.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InfoContact = void 0;
 const utils_1 = require("../utils");
-exports.InfoContact = () => {
+const InfoContact = () => {
     return {
         Info(info, { report, location }) {
             if (!info.contact) {
@@ -14,3 +14,4 @@ exports.InfoContact = () => {
         },
     };
 };
+exports.InfoContact = InfoContact;

package/lib/rules/common/info-description.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InfoDescription = void 0;
 const utils_1 = require("../utils");
-exports.InfoDescription = () => {
+const InfoDescription = () => {
     return {
         Info(info, ctx) {
             utils_1.validateDefinedAndNonEmpty('description', info, ctx);
         },
     };
 };
+exports.InfoDescription = InfoDescription;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InfoLicense = void 0;
 const utils_1 = require("../utils");
-exports.InfoLicense = () => {
+const InfoLicense = () => {
     return {
         Info(info, { report }) {
             if (!info.license) {
@@ -13,3 +13,4 @@ exports.InfoLicense = () => {
         },
     };
 };
+exports.InfoLicense = InfoLicense;

package/lib/rules/common/license-url.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InfoLicenseUrl = void 0;
 const utils_1 = require("../utils");
-exports.InfoLicenseUrl = () => {
+const InfoLicenseUrl = () => {
     return {
         License(license, ctx) {
             utils_1.validateDefinedAndNonEmpty('url', license, ctx);
         },
     };
 };
+exports.InfoLicenseUrl = InfoLicenseUrl;

package/lib/rules/common/no-ambiguous-paths.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoAmbiguousPaths = void 0;
-exports.NoAmbiguousPaths = () => {
+const NoAmbiguousPaths = () => {
     return {
         PathMap(pathMap, { report, location }) {
             const seenPaths = [];
@@ -18,6 +18,7 @@ exports.NoAmbiguousPaths = () => {
         },
     };
 };
+exports.NoAmbiguousPaths = NoAmbiguousPaths;
 function arePathsAmbiguous(a, b) {
     const partsA = a.split('/');
     const partsB = b.split('/');

package/lib/rules/common/no-enum-type-mismatch.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoEnumTypeMismatch = void 0;
 const utils_1 = require("../utils");
-exports.NoEnumTypeMismatch = () => {
+const NoEnumTypeMismatch = () => {
     return {
         Schema(schema, { report, location }) {
             if (schema.enum && schema.type && !Array.isArray(schema.type)) {
@@ -38,3 +38,4 @@ exports.NoEnumTypeMismatch = () => {
         },
     };
 };
+exports.NoEnumTypeMismatch = NoEnumTypeMismatch;

package/lib/rules/common/no-identical-paths.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoIdenticalPaths = void 0;
-exports.NoIdenticalPaths = () => {
+const NoIdenticalPaths = () => {
     return {
         PathMap(pathMap, { report, location }) {
             const pathsMap = new Map();
@@ -21,3 +21,4 @@ exports.NoIdenticalPaths = () => {
         },
     };
 };
+exports.NoIdenticalPaths = NoIdenticalPaths;

package/lib/rules/common/no-path-trailing-slash.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoPathTrailingSlash = void 0;
-exports.NoPathTrailingSlash = () => {
+const NoPathTrailingSlash = () => {
     return {
         PathItem(_path, { report, key, location }) {
             if (key.endsWith('/') && key !== '/') {
@@ -13,3 +13,4 @@ exports.NoPathTrailingSlash = () => {
         },
     };
 };
+exports.NoPathTrailingSlash = NoPathTrailingSlash;

package/lib/rules/common/operation-2xx-response.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Operation2xxResponse = void 0;
-exports.Operation2xxResponse = () => {
+const Operation2xxResponse = () => {
     return {
         ResponsesMap(responses, { report }) {
             const codes = Object.keys(responses);
@@ -14,3 +14,4 @@ exports.Operation2xxResponse = () => {
         },
     };
 };
+exports.Operation2xxResponse = Operation2xxResponse;

package/lib/rules/common/operation-description.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationDescription = void 0;
 const utils_1 = require("../utils");
-exports.OperationDescription = () => {
+const OperationDescription = () => {
     return {
         Operation(operation, ctx) {
             utils_1.validateDefinedAndNonEmpty('description', operation, ctx);
         },
     };
 };
+exports.OperationDescription = OperationDescription;

package/lib/rules/common/operation-operationId-unique.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationIdUnique = void 0;
-exports.OperationIdUnique = () => {
+const OperationIdUnique = () => {
     const seenOperations = new Set();
     return {
         Operation(operation, { report, location }) {
@@ -17,3 +17,4 @@ exports.OperationIdUnique = () => {
         },
     };
 };
+exports.OperationIdUnique = OperationIdUnique;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationIdUrlSafe = void 0;
 const validUrlSymbols = /^[A-Za-z0-9-._~:/?#\[\]@!\$&'()*+,;=]*$/;
-exports.OperationIdUrlSafe = () => {
+const OperationIdUrlSafe = () => {
     return {
         Operation(operation, { report, location }) {
             if (operation.operationId && !validUrlSymbols.test(operation.operationId)) {
@@ -14,3 +14,4 @@ exports.OperationIdUrlSafe = () => {
         },
     };
 };
+exports.OperationIdUrlSafe = OperationIdUrlSafe;

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

@@ -2,10 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationOperationId = void 0;
 const utils_1 = require("../utils");
-exports.OperationOperationId = () => {
+const OperationOperationId = () => {
     return {
-        Operation(operation, ctx) {
-            utils_1.validateDefinedAndNonEmpty('operationId', operation, ctx);
-        },
+        DefinitionRoot: {
+            PathItem: {
+                Operation(operation, ctx) {
+                    utils_1.validateDefinedAndNonEmpty('operationId', operation, ctx);
+                },
+            },
+        }
     };
 };
+exports.OperationOperationId = OperationOperationId;