@redocly/openapi-core 1.0.0-beta.126 → 1.0.0-beta.127

package/lib/bundle.js

@@ -148,6 +148,7 @@ exports.mapTypeToComponent = mapTypeToComponent;
 // function oas3Move
 function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDocument, resolvedRefMap, keepUrlRefs) {
     let components;
+    let rootLocation;
     const visitor = {
         ref: {
             leave(node, ctx, resolved) {
@@ -185,7 +186,8 @@ function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDo
             },
         },
         Root: {
-            enter(root) {
+            enter(root, ctx) {
+                rootLocation = ctx.location;
                 if (version === oas_types_1.OasMajorVersion.Version3) {
                     components = root.components = root.components || {};
                 }
@@ -253,7 +255,8 @@ function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDo
     function isEqualOrEqualRef(node, target, ctx) {
         var _a;
         if (ref_utils_1.isRef(node) &&
-            ((_a = ctx.resolve(node).location) === null || _a === void 0 ? void 0 : _a.absolutePointer) === target.location.absolutePointer) {
+            ((_a = ctx.resolve(node, rootLocation.absolutePointer).location) === null || _a === void 0 ? void 0 : _a.absolutePointer) ===
+                target.location.absolutePointer) {
             return true;
         }
         return isEqual(node, target.node);

package/lib/rules/common/spec.js

@@ -122,6 +122,7 @@ const OasSpec = () => {
                         from: refLocation,
                         location: propLocation,
                     });
+                    ignoreNextVisitorsOnNode();
                 }
                 else if (propValueType === 'array' && ((_e = propSchema.items) === null || _e === void 0 ? void 0 : _e.type)) {
                     const itemsType = (_f = propSchema.items) === null || _f === void 0 ? void 0 : _f.type;

package/lib/rules/oas2/request-mime-type.d.ts

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

package/lib/rules/oas2/response-mime-type.d.ts

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

package/lib/rules/oas3/operation-4xx-problem-details-rfc7807.d.ts

@@ -1,5 +1,5 @@
-import { Oas3Rule } from '../../visitors';
+import type { Oas3Rule } from '../../visitors';
 /**
- * Validation according rfc7807 - https://datatracker.ietf.org/doc/html/rfc7807
+ * Validation according to rfc7807 - https://datatracker.ietf.org/doc/html/rfc7807
  */
 export declare const Operation4xxProblemDetailsRfc7807: Oas3Rule;

package/lib/rules/oas3/operation-4xx-problem-details-rfc7807.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Operation4xxProblemDetailsRfc7807 = void 0;
 const utils_1 = require("../utils");
 /**
- * Validation according rfc7807 - https://datatracker.ietf.org/doc/html/rfc7807
+ * Validation according to rfc7807 - https://datatracker.ietf.org/doc/html/rfc7807
  */
 const Operation4xxProblemDetailsRfc7807 = () => {
     return {
         Response: {
-            skip(_response, key) {
+            skip(_, key) {
                 return !/4[Xx0-9]{2}/.test(`${key}`);
             },
             enter(response, { report, location }) {
@@ -19,7 +19,7 @@ const Operation4xxProblemDetailsRfc7807 = () => {
                     });
             },
             MediaType: {
-                skip(_response, key) {
+                skip(_, key) {
                     return key !== 'application/problem+json';
                 },
                 enter(media, ctx) {

package/lib/rules/oas3/request-mime-type.d.ts

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

package/lib/rules/oas3/response-mime-type.d.ts

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

package/lib/walk.d.ts

@@ -1,10 +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';
-import type { RuleSeverity } from './config';
 declare type NonUndefined = string | number | boolean | symbol | bigint | object | Record<string, any>;
 export declare type ResolveResult<T extends NonUndefined> = {
     node: T;

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,7 +28,7 @@ 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;
@@ -58,25 +58,23 @@ function walkDocument(opts) {
         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,
-                        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);
-                    }
+                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);
                 }
             }
         }
@@ -88,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 &&
@@ -129,9 +129,7 @@ function walkDocument(opts) {
                         if (!activatedOn.skipped) {
                             visitedBySome = true;
                             enteredContexts.add(context);
-                            const { ignoreNextVisitorsOnNode } = visitWithContext(visit, resolvedNode, node, context, ruleId, severity);
-                            if (ignoreNextVisitorsOnNode)
-                                break;
+                            visitWithContext(visit, resolvedNode, node, context, ruleId, severity);
                         }
                     }
                 }
@@ -238,7 +236,6 @@ function walkDocument(opts) {
         // returns true ignores all the next visitors on the specific node
         function visitWithContext(visit, resolvedNode, node, context, ruleId, severity) {
             const report = reportFn.bind(undefined, ruleId, severity);
-            let ignoreNextVisitorsOnNode = false;
             visit(resolvedNode, {
                 report,
                 resolve,
@@ -251,11 +248,10 @@ function walkDocument(opts) {
                 parentLocations: collectParentsLocations(context),
                 oasVersion: ctx.oasVersion,
                 ignoreNextVisitorsOnNode: () => {
-                    ignoreNextVisitorsOnNode = true;
+                    ignoredNodes.add(currentLocation.pointer);
                 },
                 getVisitorData: getVisitorDataFn.bind(undefined, ruleId),
             }, collectParents(context), context);
-            return { ignoreNextVisitorsOnNode };
         }
         function reportFn(ruleId, severity, opts) {
             const loc = opts.location

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "1.0.0-beta.126",
+  "version": "1.0.0-beta.127",
   "description": "",
   "main": "lib/index.js",
   "engines": {

package/__tests__/utils.ts

@@ -1,88 +0,0 @@
-import * as path from 'path';
-
-import { Document, Source, NormalizedProblem, parseYaml, stringifyYaml } from '../src';
-import { StyleguideConfig, resolveStyleguideConfig, resolvePlugins } from '../src/config';
-import { Oas3RuleSet } from '../src/oas-types';
-
-import type { RuleConfig, Plugin, DecoratorConfig } from '../src/config';
-
-export function parseYamlToDocument(body: string, absoluteRef: string = ''): Document {
-  return {
-    source: new Source(absoluteRef, body),
-    parsed: parseYaml(body, { filename: absoluteRef }),
-  };
-}
-
-export function replaceSourceWithRef(results: NormalizedProblem[], cwd?: string) {
-  const cwdRegexp = cwd ? new RegExp(cwd + path.sep, 'g') : /$^/;
-  return results.map((r) => {
-    const mapped = {
-      ...r,
-      message: r.message.replace(cwdRegexp, ''),
-      location: r.location.map((l) => ({
-        ...l,
-        source: cwd ? path.relative(cwd, l.source.absoluteRef) : l.source.absoluteRef,
-      })),
-    };
-    if (mapped.from) {
-      mapped.from = {
-        ...mapped.from,
-        source: cwd
-          ? path.relative(cwd, mapped.from.source.absoluteRef)
-          : (mapped.from.source.absoluteRef as any),
-      };
-    }
-    return mapped;
-  });
-}
-
-export const yamlSerializer = {
-  test: () => {
-    return true;
-  },
-  print: (val: any) => {
-    return stringifyYaml(val);
-  },
-};
-
-export function makeConfigForRuleset(
-  rules: Oas3RuleSet,
-  plugin?: Partial<Plugin>,
-  version: string = 'oas3'
-) {
-  const rulesConf: Record<string, RuleConfig> = {};
-  const ruleId = 'test';
-  Object.keys(rules).forEach((name) => {
-    rulesConf[`${ruleId}/${name}`] = 'error';
-  });
-  const plugins = resolvePlugins([
-    {
-      ...plugin,
-      id: ruleId,
-      rules: { [version]: rules },
-    },
-  ]);
-
-  return new StyleguideConfig({
-    plugins,
-    rules: rulesConf,
-  });
-}
-
-export async function makeConfig(
-  rules: Record<string, RuleConfig>,
-  decorators?: Record<string, DecoratorConfig>,
-  configPath?: string
-) {
-  return new StyleguideConfig(
-    await resolveStyleguideConfig({
-      styleguideConfig: {
-        plugins: [],
-        extends: [],
-        rules,
-        decorators,
-      },
-    }),
-    configPath
-  );
-}