@amartus/oas-utils 0.6.0 → 0.7.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.
- package/README.md +43 -3
- package/dist/cli.js +18 -1
- package/dist/cli.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/allOfToOneOfJsonPath.d.ts.map +1 -1
- package/dist/lib/allOfToOneOfJsonPath.js +203 -162
- package/dist/lib/allOfToOneOfJsonPath.js.map +1 -1
- package/dist/lib/cleanupDiscriminatorMappings.d.ts +14 -2
- package/dist/lib/cleanupDiscriminatorMappings.d.ts.map +1 -1
- package/dist/lib/cleanupDiscriminatorMappings.js +30 -5
- package/dist/lib/cleanupDiscriminatorMappings.js.map +1 -1
- package/dist/lib/cliActions.d.ts +14 -0
- package/dist/lib/cliActions.d.ts.map +1 -1
- package/dist/lib/cliActions.js +29 -1
- package/dist/lib/cliActions.js.map +1 -1
- package/dist/lib/removeSingleComposition.d.ts +24 -0
- package/dist/lib/removeSingleComposition.d.ts.map +1 -0
- package/dist/lib/removeSingleComposition.js +121 -0
- package/dist/lib/removeSingleComposition.js.map +1 -0
- package/dist/redocly/cleanup-discriminator-decorator.d.ts +2 -1
- package/dist/redocly/cleanup-discriminator-decorator.d.ts.map +1 -1
- package/dist/redocly/cleanup-discriminator-decorator.js +5 -2
- package/dist/redocly/cleanup-discriminator-decorator.js.map +1 -1
- package/dist/redocly/plugin.d.ts +3 -0
- package/dist/redocly/plugin.d.ts.map +1 -1
- package/dist/redocly/plugin.js +3 -0
- package/dist/redocly/plugin.js.map +1 -1
- package/dist/redocly/remove-single-composition-decorator.d.ts +6 -0
- package/dist/redocly/remove-single-composition-decorator.d.ts.map +1 -0
- package/dist/redocly/remove-single-composition-decorator.js +14 -0
- package/dist/redocly/remove-single-composition-decorator.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allOfToOneOfJsonPath.js","sourceRoot":"","sources":["../../src/lib/allOfToOneOfJsonPath.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"allOfToOneOfJsonPath.js","sourceRoot":"","sources":["../../src/lib/allOfToOneOfJsonPath.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
export interface CleanupDiscriminatorOptions {
|
|
2
|
+
/**
|
|
3
|
+
* Patterns for schema names where discriminators should be removed entirely.
|
|
4
|
+
* Supports glob-style patterns with wildcards (*).
|
|
5
|
+
* Example: ["*_RES", "*Response"] will remove discriminators from schemas ending with _RES or Response
|
|
6
|
+
*/
|
|
7
|
+
removeDiscriminatorPatterns?: string[];
|
|
8
|
+
}
|
|
1
9
|
/**
|
|
2
10
|
* Cleans up discriminator mappings by removing entries that point to non-existent schemas.
|
|
3
11
|
*
|
|
@@ -5,17 +13,21 @@
|
|
|
5
13
|
* 1. Iterates through all schemas looking for discriminator definitions
|
|
6
14
|
* 2. For each discriminator mapping entry, checks if the referenced schema exists
|
|
7
15
|
* 3. Removes mapping entries that reference undefined schemas
|
|
8
|
-
* 4.
|
|
16
|
+
* 4. Optionally removes entire discriminators from schemas matching specified patterns
|
|
17
|
+
* 5. Returns count of cleaned mappings for reporting
|
|
9
18
|
*
|
|
10
19
|
* @param doc - OpenAPI document to clean
|
|
20
|
+
* @param options - Configuration options for discriminator cleanup
|
|
11
21
|
* @returns Object with cleanup statistics
|
|
12
22
|
*/
|
|
13
|
-
export declare function cleanupDiscriminatorMappings(doc: any): {
|
|
23
|
+
export declare function cleanupDiscriminatorMappings(doc: any, options?: CleanupDiscriminatorOptions): {
|
|
14
24
|
schemasChecked: number;
|
|
15
25
|
mappingsRemoved: number;
|
|
26
|
+
discriminatorsRemoved: number;
|
|
16
27
|
details: Array<{
|
|
17
28
|
schema: string;
|
|
18
29
|
removed: string[];
|
|
19
30
|
}>;
|
|
31
|
+
removedDiscriminators: string[];
|
|
20
32
|
};
|
|
21
33
|
//# sourceMappingURL=cleanupDiscriminatorMappings.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanupDiscriminatorMappings.d.ts","sourceRoot":"","sources":["../../src/lib/cleanupDiscriminatorMappings.ts"],"names":[],"mappings":"AAGA
|
|
1
|
+
{"version":3,"file":"cleanupDiscriminatorMappings.d.ts","sourceRoot":"","sources":["../../src/lib/cleanupDiscriminatorMappings.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,2BAA2B;IAC1C;;;;OAIG;IACH,2BAA2B,CAAC,EAAE,MAAM,EAAE,CAAC;CACxC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,2BAA2B,GAAG;IAC7F,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACtD,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACjC,CAkFA"}
|
|
@@ -7,30 +7,53 @@ import { updateDiscriminatorMappings } from "./schemaTransformUtils.js";
|
|
|
7
7
|
* 1. Iterates through all schemas looking for discriminator definitions
|
|
8
8
|
* 2. For each discriminator mapping entry, checks if the referenced schema exists
|
|
9
9
|
* 3. Removes mapping entries that reference undefined schemas
|
|
10
|
-
* 4.
|
|
10
|
+
* 4. Optionally removes entire discriminators from schemas matching specified patterns
|
|
11
|
+
* 5. Returns count of cleaned mappings for reporting
|
|
11
12
|
*
|
|
12
13
|
* @param doc - OpenAPI document to clean
|
|
14
|
+
* @param options - Configuration options for discriminator cleanup
|
|
13
15
|
* @returns Object with cleanup statistics
|
|
14
16
|
*/
|
|
15
|
-
export function cleanupDiscriminatorMappings(doc) {
|
|
17
|
+
export function cleanupDiscriminatorMappings(doc, options) {
|
|
16
18
|
if (!doc || typeof doc !== "object") {
|
|
17
|
-
return { schemasChecked: 0, mappingsRemoved: 0, details: [] };
|
|
19
|
+
return { schemasChecked: 0, mappingsRemoved: 0, discriminatorsRemoved: 0, details: [], removedDiscriminators: [] };
|
|
18
20
|
}
|
|
19
21
|
const schemas = doc.components?.schemas;
|
|
20
22
|
if (!schemas || typeof schemas !== "object") {
|
|
21
|
-
return { schemasChecked: 0, mappingsRemoved: 0, details: [] };
|
|
23
|
+
return { schemasChecked: 0, mappingsRemoved: 0, discriminatorsRemoved: 0, details: [], removedDiscriminators: [] };
|
|
22
24
|
}
|
|
25
|
+
// Helper function to match schema name against glob-style patterns
|
|
26
|
+
const matchesPattern = (schemaName, patterns) => {
|
|
27
|
+
return patterns.some(pattern => {
|
|
28
|
+
const regexPattern = pattern
|
|
29
|
+
.replace(/[.+?^${}()|[\]\\]/g, '\\$&') // Escape special regex chars
|
|
30
|
+
.replace(/\*/g, '.*'); // Convert * to .*
|
|
31
|
+
const regex = new RegExp(`^${regexPattern}$`);
|
|
32
|
+
return regex.test(schemaName);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
23
35
|
// Collect all existing schema names for validation
|
|
24
36
|
const existingSchemas = new Set(Object.keys(schemas));
|
|
25
37
|
let totalMappingsRemoved = 0;
|
|
26
38
|
let schemasChecked = 0;
|
|
39
|
+
let discriminatorsRemoved = 0;
|
|
27
40
|
const details = [];
|
|
41
|
+
const removedDiscriminators = [];
|
|
28
42
|
// Iterate through all schemas
|
|
29
43
|
for (const [schemaName, schema] of Object.entries(schemas)) {
|
|
30
44
|
if (!schema || typeof schema !== "object")
|
|
31
45
|
continue;
|
|
32
|
-
// Check if schema has discriminator
|
|
46
|
+
// Check if schema has discriminator
|
|
33
47
|
if (schema.discriminator && typeof schema.discriminator === "object") {
|
|
48
|
+
// Check if discriminator should be removed based on patterns
|
|
49
|
+
if (options?.removeDiscriminatorPatterns &&
|
|
50
|
+
options.removeDiscriminatorPatterns.length > 0 &&
|
|
51
|
+
matchesPattern(schemaName, options.removeDiscriminatorPatterns)) {
|
|
52
|
+
delete schema.discriminator;
|
|
53
|
+
discriminatorsRemoved++;
|
|
54
|
+
removedDiscriminators.push(schemaName);
|
|
55
|
+
continue; // Skip to next schema since discriminator is removed
|
|
56
|
+
}
|
|
34
57
|
const discriminator = schema.discriminator;
|
|
35
58
|
if (discriminator.mapping && typeof discriminator.mapping === "object") {
|
|
36
59
|
schemasChecked++;
|
|
@@ -58,7 +81,9 @@ export function cleanupDiscriminatorMappings(doc) {
|
|
|
58
81
|
return {
|
|
59
82
|
schemasChecked,
|
|
60
83
|
mappingsRemoved: totalMappingsRemoved,
|
|
84
|
+
discriminatorsRemoved,
|
|
61
85
|
details,
|
|
86
|
+
removedDiscriminators,
|
|
62
87
|
};
|
|
63
88
|
}
|
|
64
89
|
//# sourceMappingURL=cleanupDiscriminatorMappings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanupDiscriminatorMappings.js","sourceRoot":"","sources":["../../src/lib/cleanupDiscriminatorMappings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"cleanupDiscriminatorMappings.js","sourceRoot":"","sources":["../../src/lib/cleanupDiscriminatorMappings.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/cliActions.d.ts
CHANGED
|
@@ -54,9 +54,23 @@ export declare function runSealSchema(opts: {
|
|
|
54
54
|
*/
|
|
55
55
|
export declare function runCleanupDiscriminators(opts: {
|
|
56
56
|
output?: string;
|
|
57
|
+
removePatterns?: string[];
|
|
57
58
|
}, format: (doc: any, target?: string) => string, reader: () => Promise<string>): Promise<void>;
|
|
58
59
|
export declare function runRemoveDangling(opts: {
|
|
59
60
|
output?: string;
|
|
60
61
|
aggressive?: boolean;
|
|
61
62
|
}, format: (doc: any, target?: string) => string, reader: () => Promise<string>): Promise<void>;
|
|
63
|
+
/**
|
|
64
|
+
* Removes single-composition schemas (schemas whose only content is a single
|
|
65
|
+
* allOf/anyOf/oneOf with one $ref) and rewires all references to point directly
|
|
66
|
+
* to the target schema.
|
|
67
|
+
*
|
|
68
|
+
* @param opts - Options including output path
|
|
69
|
+
* @param format - Function to format output
|
|
70
|
+
* @param reader - Function to read input
|
|
71
|
+
*/
|
|
72
|
+
export declare function runRemoveSingleComposition(opts: {
|
|
73
|
+
output?: string;
|
|
74
|
+
aggressive?: boolean;
|
|
75
|
+
}, format: (doc: any, target?: string) => string, reader: () => Promise<string>): Promise<void>;
|
|
62
76
|
//# sourceMappingURL=cliActions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliActions.d.ts","sourceRoot":"","sources":["../../src/lib/cliActions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cliActions.d.ts","sourceRoot":"","sources":["../../src/lib/cliActions.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/cliActions.js
CHANGED
|
@@ -8,6 +8,7 @@ import { allOfToOneOf } from "./allOfToOneOfJsonPath.js";
|
|
|
8
8
|
import { sealSchema } from "./sealSchema.js";
|
|
9
9
|
import { cleanupDiscriminatorMappings } from "./cleanupDiscriminatorMappings.js";
|
|
10
10
|
import { removeDanglingRefs } from "./removeDanglingRefs.js";
|
|
11
|
+
import { removeSingleComposition } from "./removeSingleComposition.js";
|
|
11
12
|
function parseYamlOrJson(data) {
|
|
12
13
|
// Accept pre-parsed objects (useful in tests)
|
|
13
14
|
if (data && typeof data === "object")
|
|
@@ -192,7 +193,12 @@ export async function runCleanupDiscriminators(opts, format, reader) {
|
|
|
192
193
|
const doc = parseYamlOrJson(await reader());
|
|
193
194
|
if (!validateComponentSchemas(doc))
|
|
194
195
|
return;
|
|
195
|
-
const result = cleanupDiscriminatorMappings(doc
|
|
196
|
+
const result = cleanupDiscriminatorMappings(doc, {
|
|
197
|
+
removeDiscriminatorPatterns: opts.removePatterns
|
|
198
|
+
});
|
|
199
|
+
if (result.discriminatorsRemoved > 0) {
|
|
200
|
+
console.error(`[CLEANUP-DISCRIMINATORS] Removed ${result.discriminatorsRemoved} discriminator(s) entirely from schemas: [${result.removedDiscriminators.join(", ")}]`);
|
|
201
|
+
}
|
|
196
202
|
if (result.schemasChecked > 0) {
|
|
197
203
|
console.error(`[CLEANUP-DISCRIMINATORS] Checked ${result.schemasChecked} schema(s) with discriminators.`);
|
|
198
204
|
if (result.mappingsRemoved > 0) {
|
|
@@ -221,4 +227,26 @@ export async function runRemoveDangling(opts, format, reader) {
|
|
|
221
227
|
}
|
|
222
228
|
await writeOutput(doc, opts.output, format);
|
|
223
229
|
}
|
|
230
|
+
/**
|
|
231
|
+
* Removes single-composition schemas (schemas whose only content is a single
|
|
232
|
+
* allOf/anyOf/oneOf with one $ref) and rewires all references to point directly
|
|
233
|
+
* to the target schema.
|
|
234
|
+
*
|
|
235
|
+
* @param opts - Options including output path
|
|
236
|
+
* @param format - Function to format output
|
|
237
|
+
* @param reader - Function to read input
|
|
238
|
+
*/
|
|
239
|
+
export async function runRemoveSingleComposition(opts, format, reader) {
|
|
240
|
+
const doc = parseYamlOrJson(await reader());
|
|
241
|
+
if (!validateComponentSchemas(doc))
|
|
242
|
+
return;
|
|
243
|
+
const result = removeSingleComposition(doc, { aggressive: Boolean(opts.aggressive) });
|
|
244
|
+
if (result.schemasRemoved > 0) {
|
|
245
|
+
console.error(`[REMOVE-SINGLE-COMPOSITION] Removed ${result.schemasRemoved} single-composition schema(s): ${result.removed.join(", ")}`);
|
|
246
|
+
}
|
|
247
|
+
else {
|
|
248
|
+
console.error("[INFO] No single-composition schemas found.");
|
|
249
|
+
}
|
|
250
|
+
await writeOutput(doc, opts.output, format);
|
|
251
|
+
}
|
|
224
252
|
//# sourceMappingURL=cliActions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliActions.js","sourceRoot":"","sources":["../../src/lib/cliActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAiB,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAqB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"cliActions.js","sourceRoot":"","sources":["../../src/lib/cliActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export interface RemoveSingleCompositionOptions {
|
|
2
|
+
/**
|
|
3
|
+
* When true, also removes single-composition schemas that have additional
|
|
4
|
+
* keywords (e.g. `description`, `discriminator`) alongside the composition keyword,
|
|
5
|
+
* unless one of the extra keywords is `properties`.
|
|
6
|
+
*
|
|
7
|
+
* @default false
|
|
8
|
+
*/
|
|
9
|
+
aggressive?: boolean;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Remove single-composition schemas from an OpenAPI document.
|
|
13
|
+
*
|
|
14
|
+
* A single-composition schema is one whose only content is a single composition keyword
|
|
15
|
+
* (allOf, anyOf, or oneOf) with exactly one $ref entry. Such schemas add indirection
|
|
16
|
+
* without semantic value and can be replaced by their target reference.
|
|
17
|
+
*
|
|
18
|
+
* Mutates the document in place and returns removal statistics.
|
|
19
|
+
*/
|
|
20
|
+
export declare function removeSingleComposition(doc: any, options?: RemoveSingleCompositionOptions): {
|
|
21
|
+
schemasRemoved: number;
|
|
22
|
+
removed: string[];
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=removeSingleComposition.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"removeSingleComposition.d.ts","sourceRoot":"","sources":["../../src/lib/removeSingleComposition.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,8BAA8B;IAC7C;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAuDD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,8BAA8B,GAAG;IAC3F,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAyDA"}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import { refToName } from './oasUtils.js';
|
|
2
|
+
import { traverseAndTransform } from './schemaTransformUtils.js';
|
|
3
|
+
const COMPOSITION_KEYWORDS = ['allOf', 'anyOf', 'oneOf'];
|
|
4
|
+
/** Keywords that prevent removal even in aggressive mode */
|
|
5
|
+
const PRESERVE_KEYWORDS = ['properties'];
|
|
6
|
+
/**
|
|
7
|
+
* Checks if a schema is a single-composition wrapper: a schema whose only content
|
|
8
|
+
* is one composition keyword (allOf/anyOf/oneOf) containing exactly one $ref entry.
|
|
9
|
+
*
|
|
10
|
+
* In aggressive mode, schemas with extra keywords (like `description` or `discriminator`)
|
|
11
|
+
* are also considered removable, unless one of the extra keywords is `properties`.
|
|
12
|
+
*
|
|
13
|
+
* @returns The target $ref string, or undefined if not a single-composition schema
|
|
14
|
+
*/
|
|
15
|
+
function getSingleCompositionTarget(schema, aggressive = false) {
|
|
16
|
+
if (!schema || typeof schema !== 'object' || Array.isArray(schema))
|
|
17
|
+
return undefined;
|
|
18
|
+
const keys = Object.keys(schema);
|
|
19
|
+
if (keys.length === 0)
|
|
20
|
+
return undefined;
|
|
21
|
+
const keyword = keys.find(k => COMPOSITION_KEYWORDS.includes(k));
|
|
22
|
+
if (!keyword)
|
|
23
|
+
return undefined;
|
|
24
|
+
const otherKeys = keys.filter(k => k !== keyword);
|
|
25
|
+
if (otherKeys.length > 0) {
|
|
26
|
+
if (!aggressive)
|
|
27
|
+
return undefined;
|
|
28
|
+
if (otherKeys.some(k => PRESERVE_KEYWORDS.includes(k)))
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
const arr = schema[keyword];
|
|
32
|
+
if (!Array.isArray(arr) || arr.length !== 1)
|
|
33
|
+
return undefined;
|
|
34
|
+
const item = arr[0];
|
|
35
|
+
if (item && typeof item === 'object' && typeof item.$ref === 'string') {
|
|
36
|
+
return item.$ref;
|
|
37
|
+
}
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Resolves transitive chains in the replacement map.
|
|
42
|
+
* If Foo→Bar and Bar→Baz, resolves Foo→Baz.
|
|
43
|
+
*/
|
|
44
|
+
function resolveTransitiveChains(replacements) {
|
|
45
|
+
for (const [from, to] of replacements) {
|
|
46
|
+
let resolved = to;
|
|
47
|
+
const visited = new Set([from]);
|
|
48
|
+
while (replacements.has(resolved) && !visited.has(resolved)) {
|
|
49
|
+
visited.add(resolved);
|
|
50
|
+
resolved = replacements.get(resolved);
|
|
51
|
+
}
|
|
52
|
+
if (resolved !== to) {
|
|
53
|
+
replacements.set(from, resolved);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Remove single-composition schemas from an OpenAPI document.
|
|
59
|
+
*
|
|
60
|
+
* A single-composition schema is one whose only content is a single composition keyword
|
|
61
|
+
* (allOf, anyOf, or oneOf) with exactly one $ref entry. Such schemas add indirection
|
|
62
|
+
* without semantic value and can be replaced by their target reference.
|
|
63
|
+
*
|
|
64
|
+
* Mutates the document in place and returns removal statistics.
|
|
65
|
+
*/
|
|
66
|
+
export function removeSingleComposition(doc, options) {
|
|
67
|
+
if (!doc || typeof doc !== 'object')
|
|
68
|
+
return { schemasRemoved: 0, removed: [] };
|
|
69
|
+
const aggressive = Boolean(options?.aggressive);
|
|
70
|
+
const schemas = doc.components?.schemas;
|
|
71
|
+
if (!schemas || typeof schemas !== 'object')
|
|
72
|
+
return { schemasRemoved: 0, removed: [] };
|
|
73
|
+
// Step 1: Identify single-composition schemas and build replacement map
|
|
74
|
+
const replacements = new Map(); // full ref → full ref
|
|
75
|
+
for (const [name, schema] of Object.entries(schemas)) {
|
|
76
|
+
const targetRef = getSingleCompositionTarget(schema, aggressive);
|
|
77
|
+
if (targetRef) {
|
|
78
|
+
const fromRef = `#/components/schemas/${name}`;
|
|
79
|
+
replacements.set(fromRef, targetRef);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
if (replacements.size === 0)
|
|
83
|
+
return { schemasRemoved: 0, removed: [] };
|
|
84
|
+
// Step 2: Resolve transitive chains
|
|
85
|
+
resolveTransitiveChains(replacements);
|
|
86
|
+
// Step 3: Replace all $ref occurrences throughout the document
|
|
87
|
+
traverseAndTransform(doc, (node) => {
|
|
88
|
+
if (node && typeof node === 'object' && typeof node.$ref === 'string') {
|
|
89
|
+
const replacement = replacements.get(node.$ref);
|
|
90
|
+
if (replacement) {
|
|
91
|
+
node.$ref = replacement;
|
|
92
|
+
return true;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return false;
|
|
96
|
+
});
|
|
97
|
+
// Step 4: Update discriminator mappings
|
|
98
|
+
for (const schema of Object.values(schemas)) {
|
|
99
|
+
if (!schema || typeof schema !== 'object')
|
|
100
|
+
continue;
|
|
101
|
+
const mapping = schema.discriminator?.mapping;
|
|
102
|
+
if (!mapping || typeof mapping !== 'object')
|
|
103
|
+
continue;
|
|
104
|
+
for (const [key, ref] of Object.entries(mapping)) {
|
|
105
|
+
if (typeof ref === 'string' && replacements.has(ref)) {
|
|
106
|
+
mapping[key] = replacements.get(ref);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
// Step 5: Delete the removed schemas
|
|
111
|
+
const removed = [];
|
|
112
|
+
for (const fromRef of replacements.keys()) {
|
|
113
|
+
const name = refToName(fromRef);
|
|
114
|
+
if (name && schemas[name]) {
|
|
115
|
+
delete schemas[name];
|
|
116
|
+
removed.push(name);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return { schemasRemoved: removed.length, removed };
|
|
120
|
+
}
|
|
121
|
+
//# sourceMappingURL=removeSingleComposition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"removeSingleComposition.js","sourceRoot":"","sources":["../../src/lib/removeSingleComposition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import { CleanupDiscriminatorOptions } from "../lib/cleanupDiscriminatorMappings.js";
|
|
2
|
+
export default function CleanupDiscriminatorsDecorator(opts?: CleanupDiscriminatorOptions): {
|
|
2
3
|
Root: {
|
|
3
4
|
leave(target: any): void;
|
|
4
5
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup-discriminator-decorator.d.ts","sourceRoot":"","sources":["../../src/redocly/cleanup-discriminator-decorator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cleanup-discriminator-decorator.d.ts","sourceRoot":"","sources":["../../src/redocly/cleanup-discriminator-decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAEnH,MAAM,CAAC,OAAO,UAAU,8BAA8B,CAAC,IAAI,GAAE,2BAAgC;;sBAGzE,GAAG;;EActB"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { cleanupDiscriminatorMappings } from "../lib/cleanupDiscriminatorMappings.js";
|
|
2
|
-
export default function CleanupDiscriminatorsDecorator(opts) {
|
|
2
|
+
export default function CleanupDiscriminatorsDecorator(opts = {}) {
|
|
3
3
|
return {
|
|
4
4
|
Root: {
|
|
5
5
|
leave(target) {
|
|
6
|
-
const result = cleanupDiscriminatorMappings(target);
|
|
6
|
+
const result = cleanupDiscriminatorMappings(target, opts);
|
|
7
|
+
if (result.discriminatorsRemoved > 0) {
|
|
8
|
+
console.log(`[CLEANUP-DISCRIMINATORS] Removed ${result.discriminatorsRemoved} discriminator(s) entirely from schemas: [${result.removedDiscriminators.join(", ")}]`);
|
|
9
|
+
}
|
|
7
10
|
if (result.mappingsRemoved > 0) {
|
|
8
11
|
console.log(`[CLEANUP-DISCRIMINATORS] Removed ${result.mappingsRemoved} mapping(s).`);
|
|
9
12
|
for (const detail of result.details) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup-discriminator-decorator.js","sourceRoot":"","sources":["../../src/redocly/cleanup-discriminator-decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,
|
|
1
|
+
{"version":3,"file":"cleanup-discriminator-decorator.js","sourceRoot":"","sources":["../../src/redocly/cleanup-discriminator-decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAA+B,MAAM,wCAAwC,CAAC;AAEnH,MAAM,CAAC,OAAO,UAAU,8BAA8B,CAAC,OAAoC,EAAE;IAC3F,OAAO;QACL,IAAI,EAAE;YACJ,KAAK,CAAC,MAAW;gBACf,MAAM,MAAM,GAAG,4BAA4B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAC1D,IAAI,MAAM,CAAC,qBAAqB,GAAG,CAAC,EAAE,CAAC;oBACrC,OAAO,CAAC,GAAG,CAAC,oCAAoC,MAAM,CAAC,qBAAqB,6CAA6C,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACvK,CAAC;gBACD,IAAI,MAAM,CAAC,eAAe,GAAG,CAAC,EAAE,CAAC;oBAC/B,OAAO,CAAC,GAAG,CAAC,oCAAoC,MAAM,CAAC,eAAe,cAAc,CAAC,CAAC;oBACtF,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;wBACpC,OAAO,CAAC,GAAG,CAAC,sCAAsC,MAAM,CAAC,MAAM,wBAAwB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvH,CAAC;gBACH,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC"}
|
package/dist/redocly/plugin.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import AllOfToOneOfDecorator from "./allof-to-oneof-decorator.js";
|
|
|
5
5
|
import SealSchemaDecorator from "./seal-schema-decorator.js";
|
|
6
6
|
import CleanupDiscriminatorsDecorator from "./cleanup-discriminator-decorator.js";
|
|
7
7
|
import RemoveDanglingDecorator from "./remove-dangling-decorator.js";
|
|
8
|
+
import RemoveSingleCompositionDecorator from "./remove-single-composition-decorator.js";
|
|
8
9
|
export default function oasRemoveUnusedPlugin(): {
|
|
9
10
|
id: string;
|
|
10
11
|
decorators: {
|
|
@@ -16,6 +17,7 @@ export default function oasRemoveUnusedPlugin(): {
|
|
|
16
17
|
"seal-schema": typeof SealSchemaDecorator;
|
|
17
18
|
"cleanup-discriminators": typeof CleanupDiscriminatorsDecorator;
|
|
18
19
|
"remove-dangling-refs": typeof RemoveDanglingDecorator;
|
|
20
|
+
"remove-single-composition": typeof RemoveSingleCompositionDecorator;
|
|
19
21
|
"remove-unused-schemas": typeof RemoveUnusedDecorator;
|
|
20
22
|
"remove-from-oneof": typeof RemoveFromOneOfDecorator;
|
|
21
23
|
};
|
|
@@ -27,6 +29,7 @@ export default function oasRemoveUnusedPlugin(): {
|
|
|
27
29
|
"seal-schema": typeof SealSchemaDecorator;
|
|
28
30
|
"cleanup-discriminators": typeof CleanupDiscriminatorsDecorator;
|
|
29
31
|
"remove-dangling-refs": typeof RemoveDanglingDecorator;
|
|
32
|
+
"remove-single-composition": typeof RemoveSingleCompositionDecorator;
|
|
30
33
|
"remove-unused-schemas": typeof RemoveUnusedDecorator;
|
|
31
34
|
"remove-from-oneof": typeof RemoveFromOneOfDecorator;
|
|
32
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/redocly/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,8BAA8B,CAAC;AACjE,OAAO,wBAAwB,MAAM,kCAAkC,CAAC;AACxE,OAAO,sBAAsB,MAAM,+BAA+B,CAAC;AACnE,OAAO,qBAAqB,MAAM,+BAA+B,CAAC;AAClE,OAAO,mBAAmB,MAAM,4BAA4B,CAAC;AAC7D,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,uBAAuB,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/redocly/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,8BAA8B,CAAC;AACjE,OAAO,wBAAwB,MAAM,kCAAkC,CAAC;AACxE,OAAO,sBAAsB,MAAM,+BAA+B,CAAC;AACnE,OAAO,qBAAqB,MAAM,+BAA+B,CAAC;AAClE,OAAO,mBAAmB,MAAM,4BAA4B,CAAC;AAC7D,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,uBAAuB,MAAM,gCAAgC,CAAC;AACrE,OAAO,gCAAgC,MAAM,0CAA0C,CAAC;AAExF,MAAM,CAAC,OAAO,UAAU,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkC5C"}
|
package/dist/redocly/plugin.js
CHANGED
|
@@ -5,6 +5,7 @@ import AllOfToOneOfDecorator from "./allof-to-oneof-decorator.js";
|
|
|
5
5
|
import SealSchemaDecorator from "./seal-schema-decorator.js";
|
|
6
6
|
import CleanupDiscriminatorsDecorator from "./cleanup-discriminator-decorator.js";
|
|
7
7
|
import RemoveDanglingDecorator from "./remove-dangling-decorator.js";
|
|
8
|
+
import RemoveSingleCompositionDecorator from "./remove-single-composition-decorator.js";
|
|
8
9
|
export default function oasRemoveUnusedPlugin() {
|
|
9
10
|
return {
|
|
10
11
|
id: "oas-utils",
|
|
@@ -18,6 +19,7 @@ export default function oasRemoveUnusedPlugin() {
|
|
|
18
19
|
"seal-schema": SealSchemaDecorator,
|
|
19
20
|
"cleanup-discriminators": CleanupDiscriminatorsDecorator,
|
|
20
21
|
"remove-dangling-refs": RemoveDanglingDecorator,
|
|
22
|
+
"remove-single-composition": RemoveSingleCompositionDecorator,
|
|
21
23
|
// Back-compat aliases
|
|
22
24
|
"remove-unused-schemas": RemoveUnusedDecorator,
|
|
23
25
|
"remove-from-oneof": RemoveFromOneOfDecorator,
|
|
@@ -31,6 +33,7 @@ export default function oasRemoveUnusedPlugin() {
|
|
|
31
33
|
"seal-schema": SealSchemaDecorator,
|
|
32
34
|
"cleanup-discriminators": CleanupDiscriminatorsDecorator,
|
|
33
35
|
"remove-dangling-refs": RemoveDanglingDecorator,
|
|
36
|
+
"remove-single-composition": RemoveSingleCompositionDecorator,
|
|
34
37
|
// Back-compat aliases
|
|
35
38
|
"remove-unused-schemas": RemoveUnusedDecorator,
|
|
36
39
|
"remove-from-oneof": RemoveFromOneOfDecorator,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/redocly/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,8BAA8B,CAAC;AACjE,OAAO,wBAAwB,MAAM,kCAAkC,CAAC;AACxE,OAAO,sBAAsB,MAAM,+BAA+B,CAAC;AACnE,OAAO,qBAAqB,MAAM,+BAA+B,CAAC;AAClE,OAAO,mBAAmB,MAAM,4BAA4B,CAAC;AAC7D,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,uBAAuB,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/redocly/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,8BAA8B,CAAC;AACjE,OAAO,wBAAwB,MAAM,kCAAkC,CAAC;AACxE,OAAO,sBAAsB,MAAM,+BAA+B,CAAC;AACnE,OAAO,qBAAqB,MAAM,+BAA+B,CAAC;AAClE,OAAO,mBAAmB,MAAM,4BAA4B,CAAC;AAC7D,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,uBAAuB,MAAM,gCAAgC,CAAC;AACrE,OAAO,gCAAgC,MAAM,0CAA0C,CAAC;AAExF,MAAM,CAAC,OAAO,UAAU,qBAAqB;IAC3C,OAAO;QACP,EAAE,EAAE,WAAW;QACb,UAAU,EAAE;YACV,IAAI,EAAE;gBACR,iDAAiD;gBACjD,eAAe,EAAE,qBAAqB;gBACtC,cAAc,EAAE,wBAAwB;gBACxC,gBAAgB,EAAE,sBAAsB;gBACxC,gBAAgB,EAAE,qBAAqB;gBACvC,aAAa,EAAE,mBAAmB;gBAClC,wBAAwB,EAAE,8BAA8B;gBACxD,sBAAsB,EAAE,uBAAuB;gBAC/C,2BAA2B,EAAE,gCAAgC;gBAC7D,sBAAsB;gBACtB,uBAAuB,EAAE,qBAAqB;gBAC9C,mBAAmB,EAAE,wBAAwB;aAC1C;YACD,IAAI,EAAE;gBACR,kBAAkB;gBAClB,eAAe,EAAE,qBAAqB;gBACtC,cAAc,EAAE,wBAAwB;gBACxC,gBAAgB,EAAE,sBAAsB;gBACxC,gBAAgB,EAAE,qBAAqB;gBACvC,aAAa,EAAE,mBAAmB;gBAClC,wBAAwB,EAAE,8BAA8B;gBACxD,sBAAsB,EAAE,uBAAuB;gBAC/C,2BAA2B,EAAE,gCAAgC;gBAC7D,sBAAsB;gBACtB,uBAAuB,EAAE,qBAAqB;gBAC9C,mBAAmB,EAAE,wBAAwB;aAC1C;SACF;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-single-composition-decorator.d.ts","sourceRoot":"","sources":["../../src/redocly/remove-single-composition-decorator.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,gCAAgC,CAAC,IAAI,EAAE,GAAG;;sBAG9C,GAAG;;EAQtB"}
|