@redocly/openapi-core 2.31.1 → 2.31.3

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":"remove-unused-components.d.ts","sourceRoot":"","sources":["../../../src/decorators/oas3/remove-unused-components.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAYvD,eAAO,MAAM,sBAAsB,EAAE,aAgIpC,CAAC"}
1
+ {"version":3,"file":"remove-unused-components.d.ts","sourceRoot":"","sources":["../../../src/decorators/oas3/remove-unused-components.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAkBvD,eAAO,MAAM,sBAAsB,EAAE,aAiIpC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { parseRef } from '../../ref-utils.js';
1
+ import { isRef, parseRef } from '../../ref-utils.js';
2
2
  import { isEmptyObject } from '../../utils/is-empty-object.js';
3
3
  import { hasComponent } from '../../utils/oas-has-component.js';
4
4
  function getComponentKey(pointer) {
@@ -11,18 +11,20 @@ function getComponentKey(pointer) {
11
11
  }
12
12
  export const RemoveUnusedComponents = () => {
13
13
  const components = new Map();
14
- function registerComponent(componentType, name) {
14
+ function registerComponent(componentType, name, referencesDiscriminator = false) {
15
15
  const key = `${componentType}/${name}`;
16
16
  components.set(key, {
17
17
  usedIn: components.get(key)?.usedIn ?? [],
18
18
  componentType,
19
19
  name,
20
+ referencesDiscriminator,
20
21
  });
21
22
  }
22
23
  function removeUnusedComponents(root, removedKeys = new Set()) {
23
24
  const removedCountBefore = removedKeys.size;
24
- for (const [key, { usedIn, name, componentType }] of components) {
25
- const used = usedIn.some((sourceKey) => sourceKey !== key && !removedKeys.has(sourceKey));
25
+ for (const [key, { usedIn, name, componentType, referencesDiscriminator }] of components) {
26
+ const used = usedIn.some((sourceKey) => sourceKey !== key && !removedKeys.has(sourceKey)) ||
27
+ referencesDiscriminator;
26
28
  if (!used &&
27
29
  componentType &&
28
30
  root.components &&
@@ -79,10 +81,9 @@ export const RemoveUnusedComponents = () => {
79
81
  },
80
82
  },
81
83
  NamedSchemas: {
82
- Schema(schema, { key }) {
83
- if (!schema.allOf) {
84
- registerComponent('schemas', key.toString());
85
- }
84
+ Schema(schema, ctx) {
85
+ const referencesDiscriminator = schema.allOf?.some((ref) => isRef(ref) && ctx.resolve(ref)?.node?.discriminator);
86
+ registerComponent('schemas', ctx.key.toString(), referencesDiscriminator);
86
87
  },
87
88
  },
88
89
  NamedParameters: {
@@ -1 +1 @@
1
- {"version":3,"file":"remove-unused-components.js","sourceRoot":"","sources":["../../../src/decorators/oas3/remove-unused-components.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"remove-unused-components.js","sourceRoot":"","sources":["../../../src/decorators/oas3/remove-unused-components.ts"],"names":[],"mappings":"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"}
@@ -207,11 +207,11 @@ export function formatProblems(problems, opts) {
207
207
  return (`[${idx + 1}] ${bgColor(fileWithLoc)} ${atPointer}\n\n` +
208
208
  `${problem.message}\n\n` +
209
209
  formatDidYouMean(problem) +
210
- (problem.reference ? `Reference: ${colorize.blue(problem.reference)}\n\n` : '') +
211
210
  getCodeframe(loc, color) +
212
211
  '\n\n' +
213
212
  formatFrom(cwd, problem.from) +
214
- `${SEVERITY_NAMES[problem.severity]} was generated by the ${colorize.blue(problem.ruleId)} rule.\n\n`);
213
+ `${SEVERITY_NAMES[problem.severity]} was generated by the ${colorize.blue(problem.ruleId)} rule.\n\n` +
214
+ (problem.reference ? `Reference: ${colorize.blue(problem.reference)}\n\n` : ''));
215
215
  }
216
216
  function formatStylish(problem, locationPad, ruleIdPad) {
217
217
  const color = COLORS[problem.severity];
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/format/format.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/format/format.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"no-unused-components.d.ts","sourceRoot":"","sources":["../../../src/rules/oas3/no-unused-components.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,eAAO,MAAM,kBAAkB,EAAE,QAoFhC,CAAC"}
1
+ {"version":3,"file":"no-unused-components.d.ts","sourceRoot":"","sources":["../../../src/rules/oas3/no-unused-components.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AASlD,eAAO,MAAM,kBAAkB,EAAE,QA0FhC,CAAC"}
@@ -1,8 +1,10 @@
1
+ import { isRef } from '../../ref-utils.js';
1
2
  export const NoUnusedComponents = () => {
2
3
  const components = new Map();
3
- function registerComponent(location, name) {
4
+ function registerComponent(location, name, referencesDiscriminator = false) {
4
5
  components.set(location.absolutePointer, {
5
6
  used: components.get(location.absolutePointer)?.used || false,
7
+ referencesDiscriminator,
6
8
  location,
7
9
  name,
8
10
  });
@@ -31,21 +33,20 @@ export const NoUnusedComponents = () => {
31
33
  Root: {
32
34
  leave(_, { report }) {
33
35
  components.forEach((usageInfo) => {
34
- if (!usageInfo.used) {
36
+ if (!usageInfo.used && !usageInfo.referencesDiscriminator) {
35
37
  report({
36
38
  message: `Component: "${usageInfo.name}" is never used.`,
37
39
  location: usageInfo.location.key(),
40
+ reference: 'https://redocly.com/docs/cli/rules/oas/no-unused-components',
38
41
  });
39
42
  }
40
43
  });
41
44
  },
42
45
  },
43
46
  NamedSchemas: {
44
- Schema(schema, { location, key }) {
45
- if (!schema.allOf) {
46
- // FIXME: find a better way to detect possible discriminator
47
- registerComponent(location, key.toString());
48
- }
47
+ Schema(schema, { location, key, resolve }) {
48
+ const referencesDiscriminator = schema.allOf?.some((ref) => isRef(ref) && resolve(ref)?.node?.discriminator);
49
+ registerComponent(location, key.toString(), referencesDiscriminator);
49
50
  },
50
51
  },
51
52
  NamedParameters: {
@@ -1 +1 @@
1
- {"version":3,"file":"no-unused-components.js","sourceRoot":"","sources":["../../../src/rules/oas3/no-unused-components.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"no-unused-components.js","sourceRoot":"","sources":["../../../src/rules/oas3/no-unused-components.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"no-unused-components.d.ts","sourceRoot":"","sources":["../../../src/rules/openrpc/no-unused-components.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,eAAO,MAAM,kBAAkB,EAAE,YAmFhC,CAAC"}
1
+ {"version":3,"file":"no-unused-components.d.ts","sourceRoot":"","sources":["../../../src/rules/openrpc/no-unused-components.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,eAAO,MAAM,kBAAkB,EAAE,YAiFhC,CAAC"}
@@ -42,9 +42,7 @@ export const NoUnusedComponents = () => {
42
42
  },
43
43
  NamedSchemas: {
44
44
  Schema(schema, { location, key }) {
45
- if (!schema.allOf) {
46
- registerComponent(location, key.toString());
47
- }
45
+ registerComponent(location, key.toString());
48
46
  },
49
47
  },
50
48
  NamedContentDescriptors: {
@@ -1 +1 @@
1
- {"version":3,"file":"no-unused-components.js","sourceRoot":"","sources":["../../../src/rules/openrpc/no-unused-components.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"no-unused-components.js","sourceRoot":"","sources":["../../../src/rules/openrpc/no-unused-components.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.31.1",
3
+ "version": "2.31.3",
4
4
  "description": "",
5
5
  "type": "module",
6
6
  "types": "lib/index.d.ts",