@redocly/openapi-core 2.12.5 → 2.12.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/rules/common/path-params-defined.js +7 -8
  2. package/lib/rules/common/path-params-defined.js.map +1 -1
  3. package/package.json +1 -1
package/lib/rules/common/path-params-defined.js CHANGED
@@ -73,13 +73,13 @@ const createOperationHandlers = (pathContext, currentOperationParams, depth = 0)
73
73
  enter() {
74
74
  currentOperationParams = new Set();
75
75
  },
76
- leave(_op, { report, location }) {
76
+ leave(_operation, { report, location }) {
77
77
  if (!pathContext.current || !currentOperationParams)
78
78
  return;
79
- collectPathParamsFromOperation(_op, currentOperationParams);
80
79
  validateRequiredPathParams(pathContext.current.templateParams, currentOperationParams, pathContext.current.definedParams, pathContext.current.path, report, location);
81
80
  },
82
81
  Parameter(parameter, { report, location }) {
82
+ collectPathParamsFromOperation(parameter, currentOperationParams);
83
83
  if (parameter.in === 'path' && parameter.name && pathContext.current) {
84
84
  currentOperationParams.add(parameter.name);
85
85
  validatePathParameter(parameter.name, pathContext.current.templateParams, pathContext.current.path, report, location);
@@ -95,13 +95,12 @@ const createOperationHandlers = (pathContext, currentOperationParams, depth = 0)
95
95
  const extractTemplateParams = (path) => {
96
96
  return new Set(Array.from(path.matchAll(pathRegex)).map((m) => m[1]));
97
97
  };
98
- const collectPathParamsFromOperation = (operation, targetSet) => {
99
- const op = operation;
100
- op?.parameters?.forEach((param) => {
101
- if (param?.in === 'path' && param?.name) {
102
- targetSet.add(param.name);
98
+ const collectPathParamsFromOperation = (parameter, targetSet) => {
99
+ if (parameter && typeof parameter === 'object' && 'in' in parameter && 'name' in parameter) {
100
+ if (parameter.in === 'path' && parameter.name) {
101
+ targetSet.add(parameter.name);
103
102
  }
104
- });
103
+ }
105
104
  };
106
105
  const validatePathParameter = (paramName, templateParams, path, report, location) => {
107
106
  if (!templateParams.has(paramName)) {
package/lib/rules/common/path-params-defined.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"path-params-defined.js","sourceRoot":"","sources":["../../../src/rules/common/path-params-defined.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"path-params-defined.js","sourceRoot":"","sources":["../../../src/rules/common/path-params-defined.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redocly/openapi-core",
3
- "version": "2.12.5",
3
+ "version": "2.12.6",
4
4
  "description": "",
5
5
  "type": "module",
6
6
  "types": "lib/index.d.ts",