@redocly/openapi-core 2.9.0 → 2.10.0

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.
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/rules/common/assertions/utils.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAqB,MAAM,YAAY,CAAC;AACpF,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEX,aAAa,EACd,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,OAAO,CAAC;IACpB,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,GAAG,EAAE,gBAAgB,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AA0BF,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,mBAAmB,GAAG,aAAa,EAAE,CAgCjF;AAwCD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,aAAa,CAAC,GAAG,CAAC,GACjC,WAAW,GAAG,WAAW,CAkE3B;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CA6B9F;AAuBD,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,GAAG,EACH,iBAAiB,GAClB,EAAE,kBAAkB,GAAG,YAAY,EAAE,CAyBrC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/rules/common/assertions/utils.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAqB,MAAM,YAAY,CAAC;AACpF,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEX,aAAa,EACd,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,OAAO,CAAC;IACpB,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,GAAG,EAAE,gBAAgB,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAkCF,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,mBAAmB,GAAG,aAAa,EAAE,CAgCjF;AAwCD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,aAAa,CAAC,GAAG,CAAC,GACjC,WAAW,GAAG,WAAW,CAkE3B;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAwC9F;AAkDD,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,GAAG,EACH,iBAAiB,GAClB,EAAE,kBAAkB,GAAG,YAAY,EAAE,CAyBrC"}
@@ -1,12 +1,18 @@
1
1
  import { asserts, runOnKeysSet, runOnValuesSet } from './asserts.js';
2
2
  import { colorize } from '../../../logger.js';
3
- import { isRef } from '../../../ref-utils.js';
3
+ import { isRef, isAbsoluteUrl } from '../../../ref-utils.js';
4
4
  import { isTruthy } from '../../../utils/is-truthy.js';
5
5
  import { keysOf } from '../../../utils/keys-of.js';
6
6
  import { isString } from '../../../utils/is-string.js';
7
7
  import { regexFromString } from '../../../utils/regex-from-string.js';
8
8
  const assertionMessageTemplates = {
9
9
  problems: '{{problems}}',
10
+ assertionName: '{{assertionName}}',
11
+ nodeType: '{{nodeType}}',
12
+ key: '{{key}}',
13
+ property: '{{property}}',
14
+ file: '{{file}}',
15
+ pointer: '{{pointer}}',
10
16
  };
11
17
  function getPredicatesFromLocators(locators) {
12
18
  const { filterInParentKeys, filterOutParentKeys, matchParentKeys } = locators;
@@ -125,8 +131,17 @@ export function buildSubjectVisitor(assertId, assertion) {
125
131
  for (const problemGroup of groupProblemsByPointer(problems)) {
126
132
  const message = assertion.message || defaultMessage;
127
133
  const problemMessage = getProblemsMessage(problemGroup);
134
+ const placeholders = {
135
+ problems: problemMessage,
136
+ assertionName: assertId,
137
+ nodeType: assertion.subject.type,
138
+ property: properties.join(', '),
139
+ key: String(ctx.key),
140
+ pointer: ctx.location.pointer,
141
+ file: getFilenameFromPath(ctx.location.source.absoluteRef),
142
+ };
128
143
  ctx.report({
129
- message: message.replace(assertionMessageTemplates.problems, problemMessage),
144
+ message: interpolateMessagePlaceholders(message, placeholders),
130
145
  location: getProblemsLocation(problemGroup) || ctx.location,
131
146
  forceSeverity: assertion.severity || 'error',
132
147
  suggest: assertion.suggest || [],
@@ -155,6 +170,25 @@ function getProblemsMessage(problems) {
155
170
  ? problems[0].message ?? ''
156
171
  : problems.map((problem) => `\n- ${problem.message ?? ''}`).join('');
157
172
  }
173
+ function getFilenameFromPath(absoluteRef) {
174
+ if (isAbsoluteUrl(absoluteRef)) {
175
+ const parts = absoluteRef.split('/');
176
+ return parts.at(-1) || absoluteRef;
177
+ }
178
+ const parts = absoluteRef.split(/[/\\]/);
179
+ return parts.at(-1) || absoluteRef;
180
+ }
181
+ function interpolateMessagePlaceholders(message, placeholders) {
182
+ let result = message;
183
+ for (const key of Object.keys(assertionMessageTemplates)) {
184
+ const template = assertionMessageTemplates[key];
185
+ const value = placeholders[key];
186
+ if (!template)
187
+ continue;
188
+ result = result.split(template).join(value);
189
+ }
190
+ return result;
191
+ }
158
192
  export function runAssertion({ assert, ctx, assertionProperty, }) {
159
193
  const currentLocation = assert.name === 'ref' ? ctx.rawLocation : ctx.location;
160
194
  if (assertionProperty) {
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/rules/common/assertions/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/rules/common/assertions/utils.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.9.0",
3
+ "version": "2.10.0",
4
4
  "description": "",
5
5
  "type": "module",
6
6
  "types": "lib/index.d.ts",